Merge branch 'master' into develop

view/templates/htconfig.tpl

@@ -3,7 +3,7 @@
 /* ********************************************************************
  *  The following configuration has to be within the .htconfig file
  *  and will not be overruled by decisions made in the admin panel.
- * 
+ *
  *  See below for variables that may be overruled by the admin panel.
  * ********************************************************************/
 
@@ -43,7 +43,7 @@ $a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto',
  *  Changes made below will only have an effect if the database does
  *  not contain any configuration for the friendica system.
  * *********************************************************************/
- 
+
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
 // It can be changed later and only applies to timestamps for anonymous viewers.
 
@@ -98,7 +98,7 @@ $a->config['system']['no_regfullname'] = true;
 //$a->config['system']['block_local_dir'] = false;
 
 // Location of the global directory
-$a->config['system']['directory'] = 'http://dir.friendi.ca';
+$a->config['system']['directory'] = 'http://dir.friendica.social';
 
 // Authentication cookie lifetime, in days
 $a->config['system']['auth_cookie_lifetime'] = 7;

view/theme/frio/README.md

@@ -13,11 +13,11 @@ I conentrated on 3 topics:
 * if you update the theme you should disable and enable the theme again from the admin panel (to apply possible new hooks)
 
 **Note:**
-This theme is marked as experimental. While it is doing its job very well in the most cases there still much work to do to get it marked as stable. So some important templates are still missing and will be added in future versions.
+While Frio is doing its job very well in most cases, there still is some work to do. Some templates are still missing and will be added in future versions.
 
 Some insights into my motivation for starting coding this theme:
 This theme should be the start of a discussion in the friendica community (users and developers) about UI/UX in friendica.
-What frameworks do we want to use? How should default friendica look like? And how do we want to use friendica? What do we need in the core code (At the present time some stuff in this is done with ugly javascript hacks and own php code)?
+What frameworks do we want to use? How should default friendica look like? And how do we want to use friendica? What do we need in the core code (At the present time some stuff this is done with ugly javascript hacks and own php code)?
 
 Coding a theme is much work but you will get a really good insight of the limitations of friendica and can start a discussion about doing things differently.
 So join the discussion at the friendica forums ;-)

view/theme/frio/css/mod_events.css

@@ -22,7 +22,7 @@
 #fc-header-right {
     margin-top: -4px;
 }
-#fc-header-right button {
+#fc-header-right .dropdown > button {
     color: inherit;
 }
 #event-calendar-title {

view/theme/frio/js/mod_display.js

@@ -4,9 +4,8 @@
 
 // Catch the GUID from the URL
 var itemGuid = window.location.pathname.split("/").pop();
-var itemGuidSafe = itemGuid.replace(/%.*/, '');
 
 $(window).load(function(){
 	// Scroll to the Item by its GUID
-	scrollToItem('item-' + itemGuidSafe);
+	scrollToItem('item-' + itemGuid);
 });

view/theme/frio/theme.php

@@ -2,7 +2,7 @@
 /*
  * Name: frio
  * Description: Bootstrap V3 theme. The theme is currently under construction, so it is far from finished. For further information have a look at the <a href="https://github.com/friendica/friendica/tree/develop/view/theme/frio/README.md">ReadMe</a>.
- * Version: V.0.7
+ * Version: V.0.8
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
  *
  */