multiple fixes

qa-include/pages/admin/admin-default.php

@@ -1375,9 +1375,9 @@ foreach ($showoptions as $optionname) {
 				$dopoints = true;
 
 				if ($optionname == 'permit_retag_cat')
-					$optionfield['label'] = qa_lang_html(qa_using_categories() ? 'profile/permit_recat' : 'profile/permit_retag') . ':';
+					$optionfield['label'] = qa_lang_html(qa_using_categories() ? 'profile/permit_recat' : 'profile/permit_retag');
 				else
-					$optionfield['label'] = qa_lang_html('profile/' . $optionname) . ':';
+					$optionfield['label'] = qa_lang_html('profile/' . $optionname);
 
 				if (in_array($optionname, array('permit_view_q_page', 'permit_view_new_users_page', 'permit_view_special_users_page', 'permit_post_q', 'permit_post_a', 'permit_post_c', 'permit_anon_view_ips')))
 					$widest = QA_PERMIT_ALL;

qa-include/qa-theme-base.php

@@ -2027,7 +2027,7 @@ class qa_html_theme_base
 				$this->output('<span class="' . $class . '-who-data">' . $post['who']['data'] . '</span>');
 
 			if (isset($post['who']['title']))
-				$this->output('<span class="' . $class . '-who-title">' . $post['who']['title'] . '</span>');
+				$this->output('🎖<span class="' . $class . '-who-title">' . $post['who']['title'] . '</span>');
 
 			// You can also use $post['level'] to get the author's privilege level (as a string)
 
@@ -2046,7 +2046,10 @@ class qa_html_theme_base
 
 	public function post_meta_flags($post, $class)
 	{
-		$this->output_split(@$post['flags'], $class . '-flags');
+		$loginlevel = qa_get_logged_in_level();
+		if ($loginlevel >= QA_USER_LEVEL_MODERATOR) {
+			$this->output_split(@$post['flags'], $class . '-flags');
+		}
 	}
 
 	public function post_tags($post, $class)

qa-lang/fr/qa-lang-main.php

@@ -172,7 +172,7 @@
 		'search_title' => 'Résultats de la recherche',
 		'selected' => 'sélectionné',
 		'send_button' => 'Envoyer',
-		'since_x' => 'depuis ^',
+		'since_x' => 'depuis le ^',
 		'suggest_ask' => 'Commencer par ^1poser une question^2 .',
 		'suggest_category_qs' => 'Pour en voir plus, cliquez sur ^1questions dans cette catégorie^2.',
 		'suggest_qs_tags' => 'Pour en voir plus, cliquez sur ^1liste complète des questions^2 ou ^3mots clés populaires^4.',

qa-lang/fr/qa-lang-profile.php

@@ -59,7 +59,7 @@
 		'permit_post_c' => 'Ajout de commentaires',
 		'permit_post_q' => 'Poser des questions',
 		'permit_post_wall' => 'Affichage des messages sur les murs des utilisateurs',
-		'permit_recat' => 'Recategoriser toute question',
+		'permit_recat' => 'Recatégoriser toute question',
 		'permit_retag' => 'Rechoisir les mots clés de toute question',
 		'permit_select_a' => 'Sélection de réponse pour toute question ',
 		'permit_view_q_page' => 'Visualisation des pages de questions',
@@ -67,8 +67,8 @@
 		'permit_view_special_users_page' => 'Visualisation de la page des utilisateurs spéciaux',
 		'permit_view_voters_flaggers' => 'Regarde qui ont voté ou signalé les messages',
 		'permit_vote_a' => 'Vote sur les réponses',
-		'permit_vote_c' => 'Voting sur les commentaires',
-		'permit_vote_down' => 'Vote -',
+		'permit_vote_c' => 'Vote sur les commentaires',
+		'permit_vote_down' => 'Vote',
 		'permit_vote_q' => 'Vote sur questions',
 		'post_wall_blocked' => 'Cet utilisateur a refusé de nouveaux messages sur son mur',
 		'post_wall_button' => 'Ajouter un message sur le mur',

qa-src/Controllers/User/UserProfile.php

@@ -598,7 +598,9 @@ class UserProfile extends BaseController
 				}
 			}
 
-			if (count($showpermits)) {
+			// Show privileges only if we're an administrator
+
+			if (count($showpermits) && ($loginlevel >= QA_USER_LEVEL_ADMIN)) {
 				$qa_content['form_profile']['fields']['permits'] = array(
 					'type' => 'static',
 					'label' => qa_lang_html('profile/extra_privileges'),

qa-theme/Cagette/qa-styles.css

@@ -15,6 +15,9 @@ body {margin:0; padding:10px;}
 body,td,input,textarea {font-size:1.4rem; font-family:"Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; color: #333;}
 a:link,a:active,a:visited {text-decoration:none;}
 a:hover {text-decoration:none;}
+a {
+	color: #00A473;
+}
 p {margin-top:0;}
 
 .qa-notice {background:#fdd; border-bottom:2px solid #00A473; color:#b00; font-size:18px; padding:.5em 32px; font-weight:bold; position:relative;}
@@ -165,22 +168,26 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
 	padding: 0;
 }
 .qa-nav-main-item a {
-	float:left; 
-	color:#333; 
+	float: left; 
+	color: #333; 
 }
 .qa-nav-main-ask a {
-	color:#00a473;
+	color: #00a473;
 }
 .qa-nav-main-link {
-	background:#fff; 
-	padding:1rem 0.5rem;}
+	background: #fff; 
+	padding: 1rem 0.5rem;
+}
 .qa-nav-main-link:hover {
-	background:#E6e9ed; 
-	text-decoration:none;}
-.qa-nav-main-selected {
-	color:#fff !important; 
+	background: #E6e9ed; 
+	text-decoration: none;
+	color: #333 !important;
+}
+.qa-nav-main-selected { 
 	background:#00a473; 
-	text-decoration:none;}
+	text-decoration:none;
+	color:#fff !important;
+}
 
 .qa-nav-main-hot .qa-nav-main-link {background:#f33;}
 .qa-nav-main-hot .qa-nav-main-link:hover, .qa-nav-main-hot .qa-nav-main-selected {background:#f66;}
@@ -383,11 +390,19 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
 
 .qa-q-item-title {color:#00a473; font-weight:bold; font-size:2rem;}
 	.qa-q-item-title a {color:#00a473;}
-.qa-q-item-content {font-size:10px; margin-top:6px; max-height:64px; overflow-y:auto; padding:4px; border:1px solid #ccc;}
+.qa-q-item-content {
+	font-size: 1.4rem; 
+	margin-bottom: 1rem;
+}
 .qa-q-item-avatar {display:inline-block; vertical-align:middle; margin-top:6px; margin-right:2px;}
 .qa-q-item-meta {display:inline-block; vertical-align:middle; margin-top:6px;}
 .qa-q-item-when-data {font-weight:bold;}
-.qa-q-item-who-title {font-size:80%; font-weight:bold; color:#900707;}
+.qa-q-item-who-title {
+	font-size: 1rem; 
+	font-weight:bold; 
+	color:#900707;
+	font-style: italic;
+}
 .qa-q-item-points-data {font-weight:bold;}
 .qa-q-item-flags {background:#f00; color:#fff; font-weight:bold; padding:2px 5px; display:inline-block;}
 .qa-q-item-tags {margin-top:8px;}
@@ -491,7 +506,13 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
 .qa-q-view-extra {font-size:13px; margin-bottom:18px; font-style:italic;}
 .qa-q-view-extra-content {font-weight:bold;}
 .qa-q-view-when-data {font-weight:bold;}
-.qa-q-view-who-title {font-size:80%; font-weight:bold; color:#900707;}
+.qa-q-view-who-title {
+	font-size: 0.8rem; 
+	font-weight: bold; 
+	color: #900707;
+	font-style:italic;
+
+}
 .qa-q-view-points-data {font-weight:bold;}
 .qa-q-view-flags {background:#f00; color:#fff; font-weight:bold; padding:2px 5px; margin:4px 0; display:inline-block;}
 .qa-q-view-tags {margin-bottom:12px;}
@@ -545,10 +566,18 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
 	color:#00a473 !important;
 }
 
+.qa-form-light-button-answer:hover {
+	color:#fff !important;
+}
+
 .qa-form-light-button-comment {
 	color:#00a473 !important;
 }
 
+.qa-form-light-button-comment:hover {
+	color:#fff !important;
+}
+
 /* Answer selection */
 
 .qa-a-selection {float:right; width:48px; text-align:center; padding:6px 0;}