From f408298d2abde104911ef6d1917d3969370f422a Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 23 Sep 2015 12:44:47 +0200
Subject: [PATCH 01/10] Added some placeholders

---
 esope_move_installation.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/esope_move_installation.php b/esope_move_installation.php
index 5aaccd400d..bc07a7fdf2 100644
--- a/esope_move_installation.php
+++ b/esope_move_installation.php
@@ -85,17 +85,17 @@ function get_input($variable, $default = '', $filter= true) {
 <?php
 echo '<h2>Définition des paramètres de configuration</h2>';
 echo '<form method="POST">';
-echo '<p>Serveur MySQL <label><input type="text" name="db_server" value="' . $db_server . '" required="required" /></label></p>';
-echo '<p>Nom de la base MySQL <label><input type="text" name="db_name" value="' . $db_name . '" required="required" /></label></p>';
-echo '<p>Utilisateur MySQL <label><input type="text" name="db_user" value="' . $db_user . '" required="required" /></label></p>';
+echo '<p>Serveur MySQL <label><input type="text" name="db_server" value="' . $db_server . '" required="required" placeholder="localhost, mysql.domain.tld..." /></label></p>';
+echo '<p>Nom de la base MySQL <label><input type="text" name="db_name" value="' . $db_name . '" required="required" placeholder="DB name, eg. elggproject" /></label></p>';
+echo '<p>Utilisateur MySQL <label><input type="text" name="db_user" value="' . $db_user . '" required="required" placeholder="DB username, eg. elgguser" /></label></p>';
 echo '<p>Mot de passe MySQL <label><input type="text" name="db_pass" value="' . $db_pass . '" /></label></p>';
-echo '<p><label>Préfixe des tables (généralement "elgg_") <input type="text" name="prefix" value="' . $prefix . '" /></label></p>';
-echo '<p><label>Ancienne URL <input type="text" name="old_www" value="' . $old_www . '" required="required" /></label></p>';
-echo '<p><label>Nouvelle URL <input type="text" name="new_www" value="' . $new_www . '" required="required" /></label></p>';
-echo '<p><label>Ancien chemin sur le serveur <input type="text" name="old_path" value="' . $old_path . '" required="required" /></label></p>';
-echo '<p><label>Nouveau chemin sur le serveur <input type="text" name="new_path" value="' . $new_path . '" required="required" /></label></p>';
-echo '<p><label>Ancien chemin des données sur le serveur <input type="text" name="old_datapath" value="' . $old_datapath . '" required="required" /></label></p>';
-echo '<p><label>Nouveau chemin des données sur le serveur <input type="text" name="new_datapath" value="' . $new_datapath . '" required="required" /></label></p>';
+echo '<p><label>Préfixe des tables (généralement "elgg_") <input type="text" name="prefix" value="' . $prefix . '" placeholder="elgg_" /></label></p>';
+echo '<p><label>Ancienne URL (sans slash final) <input type="text" name="old_www" value="' . $old_www . '" required="required" placeholder="http://old_domain.tld/elgg" /></label></p>';
+echo '<p><label>Nouvelle URL (sans slash final) <input type="text" name="new_www" value="' . $new_www . '" required="required" placeholder="http://new_domain.tld" /></label></p>';
+echo '<p><label>Ancien chemin sur le serveur <input type="text" name="old_path" value="' . $old_path . '" required="required" placeholder="/var/www/old_domain.tld/" /></label></p>';
+echo '<p><label>Nouveau chemin sur le serveur <input type="text" name="new_path" value="' . $new_path . '" required="required" placeholder="/var/www/new_domain.tld/www/" /></label></p>';
+echo '<p><label>Ancien chemin des données sur le serveur <input type="text" name="old_datapath" value="' . $old_datapath . '" required="required" placeholder="/var/www/old_domain.tld-data/" /></label></p>';
+echo '<p><label>Nouveau chemin des données sur le serveur <input type="text" name="new_datapath" value="' . $new_datapath . '" required="required" placeholder="/var/www/new_domain.tld/data/" /></label></p>';
 echo '<p><label>Exécuter la mise à jour ? <select name="execute_query">';
 if ($execute_query == 'yes') {
 	echo '<option value="no">Non</option>';

From 131f4f5765cf6f46f0790d3f9c7bdb09cb241182 Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Mon, 28 Sep 2015 12:07:46 +0200
Subject: [PATCH 02/10] Add read more support

---
 mod/cmspages/languages/en.php |  1 +
 mod/cmspages/languages/fr.php |  2 ++
 mod/cmspages/start.php        | 19 ++++++++++++----
 mod/esope/start.php           | 41 +++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/mod/cmspages/languages/en.php b/mod/cmspages/languages/en.php
index d372509eaf..fed46ce2c5 100755
--- a/mod/cmspages/languages/en.php
+++ b/mod/cmspages/languages/en.php
@@ -310,6 +310,7 @@
 	'cmspages:none' => "No CMS Page found.",
 	'cmspages:created' => "created %s",
 	'cmspages:updated' => "updated %s",
+	'cmspages:readmore' => "Read more",
 	
 	
 );
diff --git a/mod/cmspages/languages/fr.php b/mod/cmspages/languages/fr.php
index 021b064187..3f4c8b16f1 100755
--- a/mod/cmspages/languages/fr.php
+++ b/mod/cmspages/languages/fr.php
@@ -303,6 +303,8 @@
 	'cmspages:none' => "Aucune page CMS trouvée.",
 	'cmspages:created' => "créée %s",
 	'cmspages:updated' => "MAJ %s",
+	'cmspages:readmore' => "Lire la suite",
+	
 	
 );
 
diff --git a/mod/cmspages/start.php b/mod/cmspages/start.php
index 39294e8afb..647ec34b50 100755
--- a/mod/cmspages/start.php
+++ b/mod/cmspages/start.php
@@ -552,8 +552,10 @@ function cmspages_compose_module($module_name, $module_config = false) {
 			$full_view = $module_config['full_view'];
 			$type = $module_config['type'];
 			$subtype = $module_config['subtype'];
-			$limit = $module_config['limit']; if (!isset($limit)) $limit = 10;
-			$sort = $module_config['sort']; if (!isset($sort)) $sort = "time_created desc";
+			$limit = $module_config['limit'];
+			if (!isset($limit)) $limit = 10;
+			$sort = $module_config['sort'];
+			if (!isset($sort)) $sort = "time_created desc";
 			$guids = $module_config['guids'];
 			$owner_guids = $module_config['owner_guids'];
 			$container_guids = $module_config['container_guids'];
@@ -652,7 +654,7 @@ function cmspages_compose_module($module_name, $module_config = false) {
  *        + softfail si accès interdit + aucun impact sur la suite de l'affichage (contextes, etc.)
  *   - 'embed' : can be passed to change some rendering elements based on read embed
  *   - 'add_edit_link' : allow non-defined pages rendering (and edit links)
- *        Removes admin links (useful for 'inner' and 'iframe' embed mode, required for tinymce templates)
+ *   - 'noedit' : Removes admin links (useful for 'inner' and 'iframe' embed mode, required for tinymce templates)
  * STEPS :
  * 1. Check validity, access, contexts (can we display that page ?)
  * 2. Render cmspage "own" content
@@ -680,6 +682,9 @@ function cmspages_view($cmspage, $params = array(), $vars = array()) {
 	if ($params['noedit'] == 'true') $add_edit_link = false;
 	if (!empty($params['embed'])) $embed = $params['embed'];
 	if (!isset($params['recursion'])) $params['recursion'] = array();
+	$read_more = false;
+	if (isset($vars['read_more'])) $read_more = $vars['read_more'];
+
 	
 	
 	/* 1. Check validity, access, contexts (can we display that page ?) */
@@ -718,7 +723,7 @@ function cmspages_view($cmspage, $params = array(), $vars = array()) {
 			}
 			if ($exit) {
 				if ($mode != 'view') {
-					register_error('cmspages:wrongcontext');
+					register_error(elgg_echo('cmspages:wrongcontext'));
 					//forward(REFERER);
 				}
 				return;
@@ -826,6 +831,12 @@ function cmspages_view($cmspage, $params = array(), $vars = array()) {
 		$edit_link = '<a class="cmspages-admin-block cmspages-edit-level-' . $edit_level . '" href="' . elgg_get_site_url() . 'cmspages/edit/' . $pagetype . '" title="' . $edit_title . '"> ' . $edit_link . $edit_icon . '</a>' . $edit_details;
 	}
 	
+	// If asked for "Read more" button, apply it to the whole content (but before the wrapper)
+	if ($read_more) {
+		$content = elgg_get_excerpt($content, $read_more);
+		$content .= '<p><a href="' . $cmspage->getURL() . '" class="elgg-button elgg-button-action elgg-button-esope">' . elgg_echo('cmspages:readmore') . '</a></p>';
+	}
+	
 	
 	/* 4. Wrap into container (.cmspages-output) */
 	// Add enclosing span for custom styles + optional editable class and edit link
diff --git a/mod/esope/start.php b/mod/esope/start.php
index 46f5835dba..85b43a27fd 100644
--- a/mod/esope/start.php
+++ b/mod/esope/start.php
@@ -2000,6 +2000,47 @@ function esope_notification_handler(ElggEntity $from, ElggUser $to, $subject, $b
 }
 
 
+/* Determines if the user is a group administrator (=> has admin rights on any group)
+ * $user : the user to be checked
+ * $group : optional group
+ * $strict : if true and group_operators enabled, ensures the user is the group owner only 
+ *           (not a co-admin or even not an global admin)
+ */
+function esope_is_group_admin($user = false, $group = null, $strict = false) {
+	if (!elgg_instanceof($user, 'user')) {
+		if (!elgg_is_logged_in()) return false;
+		$user = elgg_get_logged_in_user_entity();
+	}
+	
+	// Checks only for a given group
+	if (elgg_instanceof($group, 'group')) {
+		if ($group->canEdit()) {
+			if (!$strict) { return true; }
+			if ($group->owner_guid == $user->guid) { return true; }
+		}
+		return false;
+	}
+	
+	// Owned group check : always validates this function test
+	$owned_groups = elgg_get_entities(array('type' => 'group', 'owner_guid' => $user->guid));
+	if ($owned_groups) { return true; }
+	// Strict check : any other method is not valid, so leave now (even not global admin)
+	if ($strict) { return false; }
+	
+	// Admin bypass
+	if ($user->isAdmin()) { return true; }
+	
+	// Now also check group operators
+	if (elgg_is_active_plugin('group_operators')) {
+		$operator_of = elgg_get_entities_from_relationship(array('types'=>'group', 'relationship_guid'=>$user->guid, 'relationship'=>'operator', 'inverse_relationship'=>false));
+		if ($operator_of) { return true; }
+	}
+	
+	// None passed : definitely not a group admin...
+	return false;
+}
+
+
 
 
 

From 6c8d96e11f45d6649f33cd33b2cd8f1c2274df15 Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Mon, 28 Sep 2015 12:36:21 +0200
Subject: [PATCH 03/10] Tree categories support

---
 mod/esope/pages/categories/listing.php        | 25 ++++++++++++---
 mod/esope/views/default/output/categories.php | 31 +++++++++++++++++++
 .../views/default/page/elements/header.php    | 16 ++++++++++
 .../default/plugins/categories/settings.php   | 28 +++++++++++++++++
 4 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 mod/esope/views/default/output/categories.php
 create mode 100644 mod/esope/views/default/plugins/categories/settings.php

diff --git a/mod/esope/pages/categories/listing.php b/mod/esope/pages/categories/listing.php
index 55c7e03747..b5cfaef02d 100644
--- a/mod/esope/pages/categories/listing.php
+++ b/mod/esope/pages/categories/listing.php
@@ -44,19 +44,36 @@
 
 // Liste des catégories (thématiques du site)
 $themes = $site->categories;
-$sidebar = '<h2>Thématiques</h2>';
+sort($themes);
+
+// We need category => category to implement label (can be different from full category name)
+$themes = array_flip($themes);
+array_walk($themes, create_function('&$v, $k', '$v = $k;'));
+
+// Add tree categories support
+foreach ($themes as $k => $theme) {
+	if (strpos($theme, '/') !== false) {
+		$theme_a = explode('/', $theme);
+		$theme_label = '';
+		for ($i = 1; $i < count($theme_a); $i++) { $theme_label .= "-"; }
+		$theme_label .= ' ' . end($theme_a);
+		$themes[$k] = $theme_label;
+	}
+}
+
+$sidebar = '<h2>' . elgg_echo('esope:categories') . '</h2>';
 $sidebar .= '<ul class="elgg-menu elgg-menu-owner-block elgg-menu-owner-block-categories elgg-menu-owner-block-default">';
 if (empty($category)) {
   $sidebar .= '<li class="elgg-state-selected"><a href="' . $url . 'categories">' . elgg_echo('esope:categories:all') . '</a></li>';
 } else {
   $sidebar .= '<li><a href="' . $url . 'categories">' . elgg_echo('esope:categories:all') . '</a></li>';
 }
-foreach ($themes as $theme) {
+foreach ($themes as $theme => $theme_label) {
   //$is_current = str_replace(' ', '+', $theme);
   if ($theme == $category) {
-    $sidebar .= '<li class="elgg-state-selected"><a href="' . $url . 'categories/list?category='.urlencode($theme) . '">' . $theme . '</a></li>';
+		$sidebar .= '<li class="elgg-state-selected"><a href="' . $url . 'categories/list?category='.urlencode($theme) . '">' . $theme_label . '</a></li>';
   } else {
-    $sidebar .= '<li><a href="' . $url . 'categories/list?category='.urlencode($theme) . '">' . $theme . '</a></li>';
+		$sidebar .= '<li><a href="' . $url . 'categories/list?category='.urlencode($theme) . '">' . $theme_label . '</a></li>';
   }
 }
 $sidebar .= '</ul>';
diff --git a/mod/esope/views/default/output/categories.php b/mod/esope/views/default/output/categories.php
new file mode 100644
index 0000000000..6501b166ff
--- /dev/null
+++ b/mod/esope/views/default/output/categories.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * View categories on an entity
+ *
+ * @uses $vars['entity']
+ */
+
+$linkstr = '';
+if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+
+	$categories = $vars['entity']->universal_categories;
+	if (!empty($categories)) {
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+		//sort($categories);
+		
+		foreach($categories as $category) {
+			$link = elgg_get_site_url() . 'categories/list?category=' . urlencode($category);
+			if (!empty($linkstr)) {
+				$linkstr .= ', ';
+			}
+			$linkstr .= '<a href="'.$link.'">' . $category . '</a>';
+		}
+	}
+
+}
+
+if ($linkstr) {
+	echo '<p class="elgg-output-categories">' . elgg_echo('categories') . ": $linkstr</p>";
+}
diff --git a/mod/esope/views/default/page/elements/header.php b/mod/esope/views/default/page/elements/header.php
index 89265e3b8f..4da4863d44 100644
--- a/mod/esope/views/default/page/elements/header.php
+++ b/mod/esope/views/default/page/elements/header.php
@@ -70,9 +70,25 @@
 	if (elgg_is_active_plugin('categories')) {
 		$categories = '';
 		$themes = $site->categories;
+		/*
 		if ($themes) foreach ($themes as $theme) {
 			$categories .= '<li><a href="' . $url . 'categories/list?category='.urlencode($theme) . '">' . $theme . '</a></li>';
 		}
+		*/
+		if ($themes) {
+			sort($themes); // Sort categories
+			foreach ($themes as $theme) {
+				// Add tree categories support
+				$theme_label = $theme;
+				if (strpos($theme, '/') !== false) {
+					$theme_a = explode('/', $theme);
+					$theme_label = '';
+					for ($i = 1; $i < count($theme_a); $i++) { $theme_label .= "-"; }
+					$theme_label .= ' ' . end($theme_a);
+				}
+				$categories .= '<li><a href="' . $url . 'categories/list?category='.urlencode($theme) . '">' . $theme_label . '</a></li>';
+			}
+		}
 	}
 	
 	// Messages non lus
diff --git a/mod/esope/views/default/plugins/categories/settings.php b/mod/esope/views/default/plugins/categories/settings.php
new file mode 100644
index 0000000000..12d77ab4e9
--- /dev/null
+++ b/mod/esope/views/default/plugins/categories/settings.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Administrator sets the categories for the site
+ *
+ * @package ElggCategories
+ */
+
+// Get site categories
+$site = elgg_get_site_entity();
+$categories = $site->categories;
+
+//if (empty($categories)) { $categories = array(); }
+if (empty($categories)) { $categories = array(); }
+sort($categories);
+$categories = implode(",\n", $categories);
+
+// @TODO : automatically add parent categories if missing
+
+?>
+<div>
+	<p><?php echo elgg_echo('categories:explanation'); ?></p>
+	<p><?php echo elgg_echo('esope:categories:tree:explanation'); ?></p>
+	<?php
+	//echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+	echo elgg_view('input/plaintext', array('value' => $categories, 'name' => 'categories'));
+	// @TODO : automatically add commas before newlines, smthg like : yourString.split(",").join("\n")
+	?>
+</div>

From 15a787d2318793ca6f61b72d5e5244234edb1191 Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 30 Sep 2015 09:44:39 +0200
Subject: [PATCH 04/10] Missing translation

---
 mod/transitions/languages/en.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/transitions/languages/en.php b/mod/transitions/languages/en.php
index 19fb0c5b4e..4591b8886e 100644
--- a/mod/transitions/languages/en.php
+++ b/mod/transitions/languages/en.php
@@ -121,6 +121,7 @@
 	'transitions:featured:title' => "Featured contributions",
 	'transitions:background:title' => "Background contributions",
 	'transitions:featured' => "Feature / put in background",
+	'transitions:featured:details' => "You can feature or put a publication in the background. This has an impact on the contribution visibility, by displaying it on the homepage, or removing it from default search results.",
 	'transitions:featured:no' => "No (default)",
 	'transitions:featured:yes' => "Yes (in background)",
 	'transitions:featured:default' => "Standard (default)",

From f07fd38e547a929c55d5e71307250e411562be0c Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 30 Sep 2015 10:05:28 +0200
Subject: [PATCH 05/10] Translated menus

---
 mod/elgg_menus/README.md                             | 12 ++++++++++++
 mod/elgg_menus/languages/en.php                      |  7 ++-----
 mod/elgg_menus/languages/fr.php                      |  5 +----
 mod/elgg_menus/start.php                             |  8 +++++---
 .../views/default/page/elements/footer.php           |  4 ++--
 .../views/default/page/elements/navbar.php           |  4 ++--
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/mod/elgg_menus/README.md b/mod/elgg_menus/README.md
index ef89c2c092..79306520ef 100755
--- a/mod/elgg_menus/README.md
+++ b/mod/elgg_menus/README.md
@@ -27,6 +27,18 @@ Submenus are displayed by default. To hide a specific submenu, and display it on
 	.elgg-menu-MENU_NAME .elgg-child-menu { display: none; }
 	.elgg-menu-MENU_NAME li:hover .elgg-child-menu { display: block; }
 
+### Translated menus
+The plugin will detect alternative versions of menus and use them it they exist.
+If the translated menu do not exist, it will default to main language 
+When using menu names in theme plugins, use the canonical menu name (without language extension).
+
+To provide language-aware versions of menus :
+1. Edit a menu
+2. Add "-LANGAGE_CODE" to its name, eg. "footer-fr"
+3. Save the menu (it will be duplicated)
+4. Edit the new translated menu strings and links
+
+
 ### Translate section headers
 Add translation strings into your theme translation file, using this key model : 
 	'menu:MENU_NAME:header:SECTION_NAME' => "Translated section name",
diff --git a/mod/elgg_menus/languages/en.php b/mod/elgg_menus/languages/en.php
index df7d2d0f43..00b53d380d 100755
--- a/mod/elgg_menus/languages/en.php
+++ b/mod/elgg_menus/languages/en.php
@@ -1,10 +1,9 @@
 <?php
 /**
- * French strings
+ * English strings
  */
-global $CONFIG;
 
-$en = array(
+return array(
 	'admin:appearance:menus' => "Custom Menus Editor",
 	
 	'elgg_menus:new' => "New menu",
@@ -112,5 +111,3 @@
 	
 );
 
-add_translation('en', $en);
-
diff --git a/mod/elgg_menus/languages/fr.php b/mod/elgg_menus/languages/fr.php
index 4f7d38f605..91c0f85a84 100755
--- a/mod/elgg_menus/languages/fr.php
+++ b/mod/elgg_menus/languages/fr.php
@@ -2,9 +2,8 @@
 /**
  * French strings
  */
-global $CONFIG;
 
-$fr = array(
+return array(
 	'admin:appearance:menus' => "Gestion des menus",
 	
 	'elgg_menus:new' => "Nouveau menu",
@@ -122,5 +121,3 @@
 	
 );
 
-add_translation('fr', $fr);
-
diff --git a/mod/elgg_menus/start.php b/mod/elgg_menus/start.php
index 7a9fa38270..b4a0880e05 100755
--- a/mod/elgg_menus/start.php
+++ b/mod/elgg_menus/start.php
@@ -45,12 +45,14 @@ function elgg_menus_init() {
 	 *  @TODO hook sur prepare:menu avec poids 1000 pour pouvoir remplacer un menu système en dernier
 	 */
 	
-	// @TODO Enable menu replacement + translated menus
-	// Note : menu switch is easier in theme, right before elgg_view_menu
+	/* @TODO Enable menu replacement + translated menus
+	 * To use translated menus, create menus ending with language code (eg. "-en")
+	 * Note : menu switch is easier in theme, right before elgg_view_menu
+	 */
 	/*
 		// Get translated menu, only if exists
 		$lang = get_language();
-		$lang_menu = elgg_menus_get_menu_config($menu . '_' . $lang);
+		$lang_menu = elgg_menus_get_menu_config($menu . '-' . $lang);
 		if ($lang_menu) $menu = $menu . '_' . $lang;
 	*/
 	// @TODO Also support translated menus (using lang suffix ? or alternate language items ?)
diff --git a/mod/theme_transitions2/views/default/page/elements/footer.php b/mod/theme_transitions2/views/default/page/elements/footer.php
index f561a0564b..124c858cec 100755
--- a/mod/theme_transitions2/views/default/page/elements/footer.php
+++ b/mod/theme_transitions2/views/default/page/elements/footer.php
@@ -14,8 +14,8 @@
 
 // Get translated menu, only if exists
 $lang = get_language();
-$lang_menu = elgg_menus_get_menu_config($menu . '_' . $lang);
-if ($lang_menu) $menu = $menu . '_' . $lang;
+$lang_menu = elgg_menus_get_menu_config($menu . '-' . $lang);
+if ($lang_menu) $menu = $menu . '-' . $lang;
 
 $partners_url = elgg_get_site_url() . 'mod/theme_transitions2/graphics/partenaires/';
 
diff --git a/mod/theme_transitions2/views/default/page/elements/navbar.php b/mod/theme_transitions2/views/default/page/elements/navbar.php
index 7bcd6fa6cd..552a68a24e 100755
--- a/mod/theme_transitions2/views/default/page/elements/navbar.php
+++ b/mod/theme_transitions2/views/default/page/elements/navbar.php
@@ -23,8 +23,8 @@
 	
 	// Get translated menu, only if exists
 	$lang = get_language();
-	$lang_menu = elgg_menus_get_menu_config($menu . '_' . $lang);
-	if ($lang_menu) $menu = $menu . '_' . $lang;
+	$lang_menu = elgg_menus_get_menu_config($menu . '-' . $lang);
+	if ($lang_menu) $menu = $menu . '-' . $lang;
 	
 	echo elgg_view_menu($menu, array('sort_by' => 'priority', 'class' => "elgg-menu-site elgg-menu-site-default clearfix"));
 	?>

From 7fef229a2b2e110159689c0e6ef34dd475f032c8 Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 30 Sep 2015 10:13:56 +0200
Subject: [PATCH 06/10] Translated menus

---
 mod/elgg_menus/actions/elgg_menus/edit.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mod/elgg_menus/actions/elgg_menus/edit.php b/mod/elgg_menus/actions/elgg_menus/edit.php
index 46ba458730..4bae763c51 100755
--- a/mod/elgg_menus/actions/elgg_menus/edit.php
+++ b/mod/elgg_menus/actions/elgg_menus/edit.php
@@ -170,9 +170,14 @@
 					if (!empty($new_section[$i])) $new_section[$i] = elgg_get_friendly_title($new_section[$i]);
 					if (!empty($new_parent_name[$i])) $new_parent_name[$i] = elgg_get_friendly_title($new_parent_name[$i]);
 					if (!empty($new_item_class[$i])) {
-						$new_item_class[$i] = explode(' ', $new_item_class[$i]);
-						$new_item_class[$i] = array_unique($new_item_class[$i]);
-						$new_item_class[$i] = implode(' ', $new_item_class[$i]);
+						$new_item_class_a = explode(' ', $new_item_class[$i]);
+						$new_item_class_a = array_unique($new_item_class_a);
+						$new_item_class[$i] = implode(' ', $new_item_class_a);
+					}
+					if (!empty($new_link_class[$i])) {
+						$new_link_class_a = explode(' ', $new_link_class[$i]);
+						$new_link_class_a = array_unique($new_link_class_a);
+						$new_link_class[$i] = implode(' ', $new_link_class_a);
 					}
 					// Add/update item
 					// Convert to bool values

From 925d136f2f10f446be4336beb243d486be9cc61b Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 30 Sep 2015 10:29:10 +0200
Subject: [PATCH 07/10] Avoid duplicated menu classes

---
 mod/elgg_menus/actions/elgg_menus/edit.php          |  2 ++
 .../views/default/elgg_menus/input/menu_item.php    | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/mod/elgg_menus/actions/elgg_menus/edit.php b/mod/elgg_menus/actions/elgg_menus/edit.php
index 4bae763c51..8171601acb 100755
--- a/mod/elgg_menus/actions/elgg_menus/edit.php
+++ b/mod/elgg_menus/actions/elgg_menus/edit.php
@@ -169,6 +169,8 @@
 					// Cleanup some inputs
 					if (!empty($new_section[$i])) $new_section[$i] = elgg_get_friendly_title($new_section[$i]);
 					if (!empty($new_parent_name[$i])) $new_parent_name[$i] = elgg_get_friendly_title($new_parent_name[$i]);
+					// Note : item_class "elgg-menu-item-{item_name}" will be automatically added when building the menu
+					// We don't bother to remove it here, but we will also remove duplicates in elgg_menus/input/menu_item view
 					if (!empty($new_item_class[$i])) {
 						$new_item_class_a = explode(' ', $new_item_class[$i]);
 						$new_item_class_a = array_unique($new_item_class_a);
diff --git a/mod/elgg_menus/views/default/elgg_menus/input/menu_item.php b/mod/elgg_menus/views/default/elgg_menus/input/menu_item.php
index b121813faa..559529b8a7 100755
--- a/mod/elgg_menus/views/default/elgg_menus/input/menu_item.php
+++ b/mod/elgg_menus/views/default/elgg_menus/input/menu_item.php
@@ -38,6 +38,19 @@
 	$confirm = $menu_item->getConfirmText();
 	$data = '';
 	$priority = $menu_item->getPriority();
+	// Remove duplicates from classes, as some classes are added automatically when building the menu 
+	// and can lead to a duplicated class)
+	// Note : item_class "elgg-menu-item-{item_name}" will be automatically added when building the menu
+	if (!empty($item_class)) {
+		$item_class = explode(' ', $item_class);
+		$item_class = array_unique($item_class);
+		$item_class = implode(' ', $item_class);
+	}
+	if (!empty($link_class)) {
+		$link_class = explode(' ', $link_class);
+		$link_class = array_unique($link_class);
+		$link_class = implode(' ', $link_class);
+	}
 }
 // Convert bool values
 if ($selected) { $selected = 'yes'; } else { $selected = 'no'; }

From 70e67d166d44bd971c632bba1281361720cc197b Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 30 Sep 2015 10:49:07 +0200
Subject: [PATCH 08/10] Remove double buttons for admins

---
 mod/transitions/views/default/forms/transitions/save.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/transitions/views/default/forms/transitions/save.php b/mod/transitions/views/default/forms/transitions/save.php
index e6f6c7927f..7077c4741a 100644
--- a/mod/transitions/views/default/forms/transitions/save.php
+++ b/mod/transitions/views/default/forms/transitions/save.php
@@ -57,8 +57,9 @@
 	));
 }
 
-// published transitions do not get the preview button
-if (!$vars['guid'] || ($transitions && $transitions->status != 'published')) {
+// Published transitions do not get the preview button
+// Admins also do not have it (as they can change manually the publication status)
+if (!$is_admin && (!elgg_instanceof($transitions, 'object') || ($transitions->status != 'published'))) {
 	$preview_button = elgg_view('input/submit', array(
 		'value' => elgg_echo('transitions:preview'),
 		'name' => 'preview',

From 1cd0a6d364fe005a662a7de742fd931f90d9c1b5 Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 30 Sep 2015 10:56:38 +0200
Subject: [PATCH 09/10] Feedback translations

---
 mod/feedback/languages/en.php | 3 +++
 mod/feedback/languages/fr.php | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mod/feedback/languages/en.php b/mod/feedback/languages/en.php
index 9c1edaf590..587c0dc010 100755
--- a/mod/feedback/languages/en.php
+++ b/mod/feedback/languages/en.php
@@ -89,6 +89,9 @@
 	'feedback:settings:memberview' => "Are site members allowed to view feedbacks ?",
 	'feedback:settings:comment' => "Enable commenting on / replying to feedbacks ?",
 	'feedback:settings:feedbackgroup' => "Associate feedbacks to one or multiple groups ?",
+	'feedback:settings:enablemood' => "Enable mood in feedbacks",
+	'feedback:settings:enableabout' => "Enable feedback categories",
+	'feedback:settings:about_values' => "Feedback categories (if enabled)",
 	
 	// Feedback status
 	'feedback:status' => "Feedbacks status",
diff --git a/mod/feedback/languages/fr.php b/mod/feedback/languages/fr.php
index 549e8f75b7..48682019d8 100755
--- a/mod/feedback/languages/fr.php
+++ b/mod/feedback/languages/fr.php
@@ -87,13 +87,16 @@
 	'feedback:option:grouptool' => "Laisser le choix au responsable de chaque groupe",
 	'feedback:enablefeedback' => "Activer le feedback dans ce groupe",
 	'feedback:page:unknown' => "URL inconnue",
-	'feedback:viewfull' => "Afficher la discusion en pleine page",
+	'feedback:viewfull' => "Afficher la discussion en pleine page",
 	'feedback:commentsreply' => "%s commentaire(s) &nbsp; &raquo;&nbsp;Répondre",
 	
 	// Settings
 	'feedback:settings:memberview' => "Les membres du site peuvent-ils consulter les feedbacks ?",
 	'feedback:settings:comment' => "Est-il possible de commenter et de répondre aux feedbacks ?",
 	'feedback:settings:feedbackgroup' => "Associer les feedbacks à un ou des groupes ?",
+	'feedback:settings:enablemood' => "Activer les humeurs",
+	'feedback:settings:enableabout' => "Activer les catégories de feedback",
+	'feedback:settings:about_values' => "Catégories de feedback (si activées)",
 	
 	// Feedback status
 	'feedback:status' => "Statut des feedbacks",

From abb8c75e691712df35d0f8d171e5bfb9c28a5fc9 Mon Sep 17 00:00:00 2001
From: Facyla ~ Florian DANIEL <facyla@gmail.com>
Date: Wed, 30 Sep 2015 15:46:19 +0200
Subject: [PATCH 10/10] priority

---
 mod/registration_filter/manifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/registration_filter/manifest.xml b/mod/registration_filter/manifest.xml
index 1a6af0c542..7e13577cb3 100644
--- a/mod/registration_filter/manifest.xml
+++ b/mod/registration_filter/manifest.xml
@@ -19,9 +19,9 @@
 	<category>filter</category>
 	
 	<requires>
-		<type>plugin</type>
-		<name>invitefriends</name>
+		<type>priority</type>
 		<priority>after</priority>
+		<plugin>invitefriends</plugin>
 	</requires>
 	
 	<activate_on_install>false</activate_on_install>