merge manualy from trunk r1389:1392

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1393 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 95 insertions, 108 deletions

diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css
new file mode 100644
index 000000000..f3e6e8adb
--- /dev/null
+++ b/template/yoga/admin/default-layout.css
@@ -0,0 +1,94 @@
+BODY#theAdminPage #theHeader P {
+  display: none;
+}
+
+/* History tables */
+TABLE.table2 {
+  border: 1px solid black;
+  margin: 1em auto;
+  padding: 0;
+}
+
+TABLE.table2 TD, TABLE.table2 TH {
+  padding: 0 1em;
+}
+
+TABLE.table2 TR {
+  text-align: left;
+}
+
+TABLE.table2 TR.throw {
+  text-align: center;
+}
+
+.hour {
+  white-space: pre;
+}
+
+.number {
+  text-align: right;
+}
+
+TABLE#dailyStats {
+  width: 60%;
+}
+
+TABLE#detailedStats {
+  width: 80%;
+}
+
+/* categoryOrdering */
+SELECT.categoryList {
+  width: 100%;
+}
+
+FORM#categoryOrdering {
+  padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
+  padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
+}
+FORM#categoryOrdering p {
+	text-align: left;
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+UL.categoryUl {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+LI.categoryLi {
+  border: 1px solid gray;
+  padding: 0px 5px;
+  margin-bottom: 5px;
+}
+
+FORM#categoryOrdering UL.categoryActions {
+  float: right;
+  margin-top: 5px;
+}
+/* */
+
+FORM#cat_modify TABLE { width: auto; }
+
+FIELDSET.elementEdit A {
+  display: block;
+  float: right;
+}
+
+TABLE.doubleSelect {
+  text-align: center;
+  margin: 0 auto;
+  width: 100%;
+}
+
+TABLE.doubleSelect TD {
+  padding: 0 5px;
+  width: 50%;
+}
+
+FORM#categoryPermissions LI {
+  display:inline;
+  white-space: nowrap;
+}
+
diff --git a/template/yoga/content.css b/template/yoga/content.css
index 1fcc4630a..eee5baaa0 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -119,20 +119,6 @@ UL.categoryActions {
   padding: 0.5em;
 }
 
-/* should be in admin.css ? CSS properties also used in popuphelp */
-
-SPAN.pwgScreen {
-  border-bottom: 1px dotted black;
-}
-
-SPAN.filename:before {
-  content: "[";
-}
-
-SPAN.filename:after {
-  content: "]";
-}
-
 /* begin chronology/calendar elements*/
 #content DIV.calendarViews {
   display: block;
diff --git a/template/yoga/dclear.css b/template/yoga/dclear.css
deleted file mode 100644
index e69de29bb..000000000
--- a/template/yoga/dclear.css
+++ /dev/null
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 855b7e7dc..e409ceff5 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -1,5 +1,5 @@
 /* $Id$ */
-
+@import "admin/default-layout.css";
 BODY {
     margin: 5px;
     padding: 0;
@@ -79,74 +79,6 @@ TEXTAREA.description {
   width: 500px;
   overflow: auto;
 }
-SELECT.categoryList {
-  width: 100%;
-}
-
-/** go to an admin.css ? **/
-
-TABLE.table2 {
-  border: 1px solid black;
-  margin: 1em auto;
-  padding: 0;
-}
-
-TABLE.table2 TD, TABLE.table2 TH {
-  padding: 0 1em;
-}
-
-TABLE.table2 TR {
-  text-align: left;
-}
-
-TABLE.table2 TR.throw {
-  text-align: center;
-}
-
-.hour {
-  white-space: pre;
-}
-
-.number {
-  text-align: right;
-}
-  
-TABLE#dailyStats {
-  width: 60%;
-}
-
-TABLE#detailedStats {
-  width: 80%;
-}
-
-FORM#add_virtual P { text-align: left; }
-FORM#categoryOrdering, FORM#addVirtual {
-  padding-left: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
-  padding-right: 1em; /* same as FIELDSET margin (there is no fieldset in this form) */
-}
-FORM#categoryOrdering p {
-	text-align: left;
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-UL.categoryUl {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-LI.categoryLi {
-  border: 1px solid gray;
-  padding: 0px 5px;
-  margin-bottom: 5px;
-}
-
-FORM#categoryOrdering UL.categoryActions {
-  float: right;
-  margin-top: 5px;
-}
-
-FORM#cat_modify TABLE { width: auto; }
 
 /**
  * Filter forms are displayed label by label with the input (or select...)
@@ -245,27 +177,6 @@ FORM.properties SPAN.property {
   padding: 0 0.5em 0 0;
 }
 
-FIELDSET.elementEdit A {
-  display: block;
-  float: right;
-}
-
-TABLE.doubleSelect {
-  text-align: center;
-  margin: 0 auto;
-  width: 100%;
-}
-
-TABLE.doubleSelect TD {
-  padding: 0 5px;
-  width: 50%;
-}
-
-FORM#categoryPermissions LI {
-  display:inline;
-  white-space: nowrap;
-}
-
 #theHeader H1 {
   margin-bottom: 0.5em;
 }
@@ -275,10 +186,6 @@ FORM#categoryPermissions LI {
   padding: 0;
 }
 
-BODY#theAdminPage #theHeader P {
-  display: none;
-}
-
 BODY#thePopuphelpPage #copyright {
   color: green;
   display: none;