Merge lp:~xabilon/ubuntu-fr-forum/limit-recherches+CSS-admin into lp:ubuntu-fr-forum

[xabilon]

Limitation à 300 résultats des recherches (nécessaire pour les gros forums)
Correction du CSS pour les pages d'admin

[nesthib (nesthib)]

L'ajout de la limite + le changement de config PHP semble corriger le problème de avec search.php?action=show_unanswered

review: Approve

[nesthib (nesthib)]

L'erreur était :

FastCGI sent in stderr: "PHP message: PHP Fatal error: Allowed memory size of 33554432 bytes exhausted (tried to allocate 1139950 bytes) in /srv/www/forum.ubuntu-fr.org/htdocs/search.php on line 439

et le changement de config (/etc/php5/fpm/php-fpm.conf) :

php_admin_value[memory_limit] = 128M

=== modified file 'search.php'
--- search.php	2013-09-04 20:38:50 +0000
+++ search.php	2014-02-18 23:27:44 +0000
@@ -337,7 +337,7 @@
 				if ($pun_user['is_guest'])
 					message($lang_common['No permission'], false, '403 Forbidden');
 
-				$result = $db->query('SELECT t.id FROM '.$db->prefix.'topics AS t LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.last_post>'.$pun_user['last_visit'].' AND t.moved_to IS NULL'.(isset($_GET['fid']) ? ' AND t.forum_id='.intval($_GET['fid']) : '').$sql_fid.' ORDER BY t.last_post DESC') or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
+				$result = $db->query('SELECT t.id FROM '.$db->prefix.'topics AS t LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.last_post>'.$pun_user['last_visit'].' AND t.moved_to IS NULL'.(isset($_GET['fid']) ? ' AND t.forum_id='.intval($_GET['fid']) : '').$sql_fid.' ORDER BY t.last_post DESC LIMIT 300') or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
 				$num_hits = $db->num_rows($result);
 
 				if (!$num_hits)
@@ -346,7 +346,7 @@
 			// If it's a search for recent posts (in a certain time interval)
 			else if ($action == 'show_recent')
 			{
-				$result = $db->query('SELECT t.id FROM '.$db->prefix.'topics AS t LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.last_post>'.(time() - $interval).' AND t.moved_to IS NULL'.(isset($_GET['fid']) ? ' AND t.forum_id='.intval($_GET['fid']) : '').$sql_fid.' ORDER BY t.last_post DESC') or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
+				$result = $db->query('SELECT t.id FROM '.$db->prefix.'topics AS t LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.last_post>'.(time() - $interval).' AND t.moved_to IS NULL'.(isset($_GET['fid']) ? ' AND t.forum_id='.intval($_GET['fid']) : '').$sql_fid.' ORDER BY t.last_post DESC LIMIT 300') or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
 				$num_hits = $db->num_rows($result);
 
 				if (!$num_hits)
@@ -405,7 +405,7 @@
 			// If it's a search for unanswered posts
 			else
 			{
-				$result = $db->query('SELECT t.id FROM '.$db->prefix.'topics AS t LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.num_replies=0 AND t.moved_to IS NULL ORDER BY t.last_post DESC') or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
+				$result = $db->query('SELECT t.id FROM '.$db->prefix.'topics AS t LEFT JOIN '.$db->prefix.'forum_perms AS fp ON (fp.forum_id=t.forum_id AND fp.group_id='.$pun_user['g_id'].') WHERE (fp.read_forum IS NULL OR fp.read_forum=1) AND t.num_replies=0 AND t.moved_to IS NULL ORDER BY t.last_post DESC LIMIT 300') or error('Unable to fetch topic list', __FILE__, __LINE__, $db->error());
 				$num_hits = $db->num_rows($result);
 
 				if (!$num_hits)

=== modified file 'style/imports/base_admin.css' (properties changed: -x to +x)
--- style/imports/base_admin.css	2013-09-04 20:38:50 +0000
+++ style/imports/base_admin.css	2014-02-18 23:27:44 +0000
@@ -1,52 +1,59 @@
-#adminconsole .block2 {margin-top: 12px}
-
-/*** Admin Main Content ***/
-* html #adstats dd {height: 1%}
-#adstats dd {margin-left: 14em; padding: 3px; margin-bottom: 5px; line-height: 1.5em}
-#adstats dt {float: left; width: 13em; padding: 3px; line-height: 1.5em}
-#adstats {padding: 15px 15px 5px 10px}
-#adintro {padding: 5px}
-#adintro p {padding: 10px}
-#adstats dl {padding: 5px 0 10px 5px}
-
-#adminconsole fieldset td {text-align: left; padding: 4px; white-space: normal}
-#adminconsole fieldset th {text-align: left; padding: 4px; white-space: normal}
-#adminconsole fieldset td span, #adminconsole fieldset th span {display: block; font-size: 1em; font-weight: normal}
-#adminconsole th {width: 15em; font-weight: bold}
-#adminconsole input, #adminconsole select, #adminconsole textarea {margin-bottom: 0; margin-top: 0; font-weight: normal}
-#adminconsole table.aligntop th, #adminconsole table.aligntop td {vertical-align: top}
-#adminconsole table.aligntop th {padding-top: 0.7em}
-/* #adminconsole td, #adminconsole th {border-style: solid; border-width: 3px 0 3px 0} */
-#adminconsole p {padding-bottom: 6px}
-#adminconsole .topspace {padding-top: 6px}
-#adminconsole p.submittop, #adminconsole p.submitend {text-align: center}
-#adminconsole th.hidehead {color: #f1f1f1}
-#adminconsole thead th {padding-bottom: 0}
-#adminconsole p.linkactions {font-weight: bold; padding-left: 5px}
-#adminconsole th input, #adminconsole div.fsetsubmit {margin-top: 6px}
-
-/*** Particular table settings ***/
-#categoryedit .tcl {width: 25%}
-#censoring .tcl, #censoring .tc2 {width: 20%}
-#edforum .tcl, #edforum .tc2 {width: 8%}
-#edforum .tc2 {width: 6%}
-
-table#forumperms th, table#forumperms td {white-space: normal; width: auto; text-align: center}
-table#forumperms .atcl {text-align: left; width: 15em; white-space: nowrap}
-#adminconsole td.nodefault {background-color: #d59b9b}
-
-/*** User/Ban Search Result Tables ***/
-#users2 th, #bans1 th {text-align: left}
-#users2 th.tcmod {text-align: center}
-#users2 .tcl, #bans1 .tcl {width: auto; text-align: left; padding: 4px 6px}
-#users2 .tc2, #bans1 .tc2 {width: 18%; text-align: left; padding: 4px 6px}
-#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {width: 12%; text-align: left; padding: 4px 6px}
-#users2 .tc4, #bans1 .tc4 {width: 10%; text-align: center}
-#users2 .tcr {width: 20%; white-space: nowrap}
-#bans1 .tcr {width: 15%; white-space: nowrap}
-#users2 .tcmod {width: 10%; text-align: center}
-#adminconsole #linkst, #adminconsole #linksb a {font-weight: bold}
-
-/*** Plugins ***/
-.plugin .inbox {padding-bottom: 10px}
-.plugin p {padding: 10px 10px 0}
+ 
+/****** PAGES D ADMINS *****/
+
+#adminconsole .blockform
+{
+float:left;
+width:82%;
+margin-top: 8px;
+}
+/* XABILON : Menu Admin */
+
+#adminconsole {
+  width: 100%}
+
+#adminmenu {
+  width: 15%;
+  height: 100%;
+  float: left;
+  padding: 5px;
+  margin-right: 5px;
+  margin-top : 8px;
+  background-color: #F0F0F0;
+  border: 1px solid grey;
+  -moz-border-radius: 5px;
+  -khtml-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+
+#adminmenu h2 {
+  font-size: 1em;
+  font-weight: bold;
+  background-color: lightgrey;
+}
+
+#adminmenu a:hover {
+  font-weight: bold;
+  color: black;
+  text-decoration: none;
+}
+
+#adminmenu li {display: block}
+
+#adminconsole .block {
+  width: 80%;
+  float: right;
+}
+
+#edforum .tcl {width: 15%}
+#edforum .tc2 {width: 15%}
+
+ 
+/* AJOUTE PAR LA 1.4.7 */
+#users2 .tcl, #bans1 .tcl {WIDTH: auto; TEXT-ALIGN: left; PADDING: 4px 6px}
+#users2 .tc2, #bans1 .tc2 {WIDTH: 18%; TEXT-ALIGN: left; PADDING: 4px 6px}
+#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {WIDTH: 12%; TEXT-ALIGN: left; PADDING: 4px 6px}
+#users2 .tc4, #bans1 .tc4 {WIDTH: 10%; TEXT-ALIGN: center}
+#users2 .tcr {WIDTH: 20%; WHITE-SPACE: nowrap}
+#bans1 .tcr {WIDTH: 15%; WHITE-SPACE: nowrap}
+#users2 .tcmod {WIDTH: 10%; TEXT-ALIGN: center}
\ No newline at end of file