- merge content of layout.css and popuphelp.css (very few lines) into existing css -> faster page loading the first time (avoid 2 http requests)

- optimized sql for $conf['display_fromto'] in category_cats.inc.php

git-svn-id: http://piwigo.org/svn/trunk@2091 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 29 insertions, 33 deletions

diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 2b43bc5bc..010b914ab 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -215,11 +215,6 @@ FORM.properties SPAN.property {
   padding: 0;
 }
 
-BODY#thePopuphelpPage #copyright {
-  color: green;
-  display: none;
-}
-
 FORM#addComment FIELDSET LABEL {
   clear: both;
 }
@@ -252,7 +247,7 @@ UL.tagSelection LI {
 }
 
 #fullTagCloud {
-  font-size: 140%;
+  font-size: 120%;
   text-align: justify;
   padding: 0;
   margin: 1em 2em 1em 2em;
@@ -263,12 +258,34 @@ UL.tagSelection LI {
   white-space: nowrap;
 }
 
-#content #fullTagCloud {
-  font-size: 120%;
-}
 
 .tagLevel5 { font-size: 150%; }
 .tagLevel4 { font-size: 140%; }
 .tagLevel3 { font-size: 120%; }
 .tagLevel2 { font-size: 100%; }
 .tagLevel1 { font-size: 90%; }
+
+
+/* Popup help page */
+BODY#thePopuphelpPage #copyright {
+  display: none;
+}
+
+BODY#thePopuphelpPage #theHeader P {
+  display: none;
+}
+
+BODY#thePopuphelpPage #content P {
+  text-align: justify;
+  padding: 0.5em;
+}
+
+BODY#thePopuphelpPage #content OL LI,
+BODY#thePopuphelpPage #content UL LI
+{
+  margin-bottom: 0.5em;
+}
+
+BODY#thePopuphelpPage P#pageBottomActions A {
+  border: none;
+}
diff --git a/template/yoga/layout.css b/template/yoga/layout.css
index fdc3ca664..348ea2f4c 100644
--- a/template/yoga/layout.css
+++ b/template/yoga/layout.css
@@ -5,10 +5,11 @@
 @import "content.css";
 @import "thumbnails.css";
 @import "picture.css";
-@import "popuphelp.css";
 @import "default-layout.css";
 /* Override properties with import local file */
 @import "local-layout.css";
 /* common css */
-@import "../../template-common/layout.css";
+@import "../../template-common/default-layout.css";
+/* Override properties with import local file */
+@import "../../template-common/local-layout.css";
 
diff --git a/template/yoga/popuphelp.css b/template/yoga/popuphelp.css
deleted file mode 100644
index b61b7952d..000000000
--- a/template/yoga/popuphelp.css
+++ /dev/null
@@ -1,22 +0,0 @@
-BODY#thePopuphelpPage #copyright {
-  display: none;
-}
-
-BODY#thePopuphelpPage #theHeader P {
-  display: none;
-}
-
-BODY#thePopuphelpPage #content P {
-  text-align: justify;
-  padding: 0.5em;
-}
-
-BODY#thePopuphelpPage #content OL LI,
-BODY#thePopuphelpPage #content UL LI
-{
-  margin-bottom: 0.5em;
-}
-
-BODY#thePopuphelpPage P#pageBottomActions A {
-  border: none;
-}