From ea5083e2dc76f5107562e6fd75d83c4bc37f3ed8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 16 Sep 2011 19:08:44 +0100
Subject: added styles for general tabs (to be used in mediamanager and other
 components)

---
 lib/tpl/default/_tabs.css | 37 +++++++++++++++++++++++++++++++++++++
 lib/tpl/default/style.ini |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 lib/tpl/default/_tabs.css

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css
new file mode 100644
index 000000000..8bfb676a0
--- /dev/null
+++ b/lib/tpl/default/_tabs.css
@@ -0,0 +1,37 @@
+
+.dokuwiki ul.tabs {
+    padding: 0;
+    margin: 0;
+    overflow: hidden;
+}
+.dokuwiki ul.tabs li {
+    float: left;
+    padding: 0;
+    margin: 0;
+    list-style: none;
+}
+
+.dokuwiki ul.tabs li strong,
+.dokuwiki ul.tabs li a {
+    float: left;
+    padding: .3em .8em;
+    margin: 0 .3em 0 0;
+    background-color: __background_neu__;
+    color: __text__;
+    border-radius: .5em .5em 0 0;
+}
+.dokuwiki ul.tabs li strong {
+    font-weight: normal;
+}
+
+.dokuwiki ul.tabs li a:link,
+.dokuwiki ul.tabs li a:visited {
+}
+.dokuwiki ul.tabs li a:hover,
+.dokuwiki ul.tabs li a:active,
+.dokuwiki ul.tabs li a:focus,
+.dokuwiki ul.tabs li strong {
+    background-color: __background_alt__;
+    color: __text__;
+    text-decoration: none;
+}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index 05914012e..d301869f2 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -16,6 +16,7 @@ _admin.css        = screen
 _linkwiz.css      = screen
 _subscription.css = screen
 mediamanager.css  = screen
+_tabs.css         = screen
 _fileuploader.css = screen
 
 rtl.css        = rtl
-- 
cgit v1.2.3


From e27ba3dbc85c38d85a613338eea842f1fe9d56a0 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 16 Sep 2011 20:58:39 +0100
Subject: improved media options css (and removed lots of dead css code)

---
 lib/tpl/default/_mediaoptions.css | 66 +++++----------------------------------
 1 file changed, 7 insertions(+), 59 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
index 68a5b9fa7..81e87aa8e 100644
--- a/lib/tpl/default/_mediaoptions.css
+++ b/lib/tpl/default/_mediaoptions.css
@@ -1,70 +1,18 @@
-/* --- popup --- */
 
 #media__popup_content p {
-    display:block;
-    line-height:14pt;
-    margin:0.5em;
-}
-
-#media_nolink {
-    padding:4px 0;
+    margin: 0 0 .5em;
 }
 
 #media__popup_content label {
-    float:left;
-    width:9em;
+    float: left;
+    width: 9em;
 }
 
 #media__popup_content .button {
-    margin-left:auto;
-    margin-right:auto;
-}
-
-#media__popup_content .btnlbl {
-    text-align:center;
-}
-
-#media__popup_content .btnlbl input {
-    margin:0 1em;
-}
-
-/* --- display options --- */
-
-#media__linkopts label,
-#media__nolnk {
-	width: 80px;
-	float: left;
-	margin-left: 10px;
-}
-
-#media__linkopts label{
-	line-height: 20px;
-}
-
-#media__nolnk,
-#media__linkopts label.long{
-	margin-bottom: 8px;
-	line-height: 12px;
-}
-
-#media__linkopts label.long{
-	width: 150px;
-	float: none;
+    margin-right: 1px;
+    cursor: pointer;
 }
 
-#media__linkopts br {
-	clear: both;
-}
-
-#media__linkopts select {
-	width: 60px;
-	margin-left: 10px;
-}
-
-#media__linkopts input.edit {
-    width:50px;
-    margin-left:10px;
-}
-#media__linkopts #media__title {
-    width:150px;
+#media__popup_content input.button {
+    margin-left: 9em;
 }
-- 
cgit v1.2.3


From 32bb4dd2402ee999e6bc7be7e6fa1dd5c58049b1 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 17 Sep 2011 11:07:59 +0200
Subject: better resize handles in media manager

---
 lib/tpl/default/images/resizecol.png | Bin 443 -> 225 bytes
 lib/tpl/default/mediamanager.css     |   9 +++------
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/images/resizecol.png b/lib/tpl/default/images/resizecol.png
index 79fea0770..f0111507c 100644
Binary files a/lib/tpl/default/images/resizecol.png and b/lib/tpl/default/images/resizecol.png differ
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index ea69dbeb9..ee8128a48 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -60,15 +60,12 @@
 }
 
 #mediamanager__page .ui-resizable-e {
-    width: 16px;
-    right: -13px;
-    /* icon from Crystal Clear icon set (LGPL) */
-    background: transparent url(images/resizecol.png) 0 25px no-repeat;
+    width: 7px;
+    right: -9px;
+    background: transparent url(images/resizecol.png) center center no-repeat;
 }
 
 #mediamanager__page .ui-resizable-e:hover {
-    width: 6px;
-    right: -8px;
     background-image: none;
     background-color: __background_alt__;
 }
-- 
cgit v1.2.3


From 95b451bc621ae202d0229176ad0712b22d14c953 Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sat, 17 Sep 2011 19:36:34 +0200
Subject: Rework media manager HTML (JS and CSS will come)

---
 lib/tpl/default/mediamanager.css | 124 ++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 66 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index ea69dbeb9..b1905f8a0 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -1,29 +1,21 @@
 /* Layout */
 
-#mediamanager__page {
-    width: 100%;
-    overflow-x: auto;
-}
-
 #mediamanager__page h1 {
     margin: 0 0 .5em;
 }
 
-#mediamanager__layout {
+#mediamanager__page {
     min-width: 840px;
+    width: 100%;
+    overflow-x: auto;
 }
 
-#mediamanager__layout .layout,
-#mediamanager__layout .layout-resizable {
+#mediamanager__page .panel {
     float: left;
-}
-
-#mediamanager__layout .layout-resizable {
     margin-right: 10px;
-    float: left;
 }
 
-#mediamanager__layout .scroll-container {
+#mediamanager__page .panelContent {
     overflow-y: auto;
     overflow-x: hidden;
     padding: 0;
@@ -32,7 +24,7 @@
     position: relative;
 }
 
-#mediamanager__layout .background-container {
+#mediamanager__page .panelHeader {
     background-color: __background_alt__;
     margin-bottom: 10px;
     padding: 10px 10px 8px;
@@ -40,21 +32,21 @@
     min-height: 20px;
 }
 
-#mediamanager__layout .background-container .icon {
+#mediamanager__page .panelHeader .icon {
     margin-right: 5px;
 }
 
-#mediamanager__layout_namespaces {
+#mediamanager__page .namespaces {
     width: 15%;
     min-width: 125px;
 }
 
-#mediamanager__layout_list {
+#mediamanager__page .filelist {
     width: 45%;
     min-width: 375px;
 }
 
-#mediamanager__layout_detail {
+#mediamanager__page_detail {
     width: 35%;
     min-width: 290px;
 }
@@ -75,22 +67,22 @@
 
 /* Namespaces tree */
 
-#mediamanager__page ul.idx {
+#mediamanager__page .namespaces ul.idx {
     margin-left: .2em;
 }
 
-#mediamanager__page ul.idx ul {
+#mediamanager__page .namespaces ul.idx ul {
     margin-left: 1em;
 }
 
-.idx .selected {
+#mediamanager__page .namespaces ul.idx .selected {
     background-color: __highlight__;
     font-weight: bold;
 }
 
 /* Tabs */
 
-.mediamanager-tabs a {
+#mediamanager__page div.panel h2.a11y {
     font-weight: bold;
     display: block;
     float: left;
@@ -106,18 +98,18 @@
     border-top-left-radius: 10px;
 }
 
-.mediamanager-tabs .selected {
+#mediamanager__page div.panel h2.a11y .selected {
     background-color: __background_alt__;
 }
 
-.mediamanager-tabs a:hover {
+#mediamanager__page div.panel h2.a11y a:hover {
     background-color: __background_alt__;
     opacity: 0.5;
 }
 
 /* Title links */
 
-#mediamanager__files .namespace {
+#mediamanager__page .filelist .panelHeader h3 {
     float: left;
     font-weight: normal;
 }
@@ -164,18 +156,18 @@
 
 /* File list */
 
-#mediamanager__file_list {
+#mediamanager__page .filelist .list {
     padding: 0;
     margin: 0 !important;
 }
 
-#mediamanager__file_list li:hover {
+#mediamanager__page .filelist .list li:hover {
     background-color: __background_alt__;
 }
 
 /* Files thumbs view */
 
-.mediamanager-thumbs li {
+#mediamanager__page .filelist .thumbs li {
     width: 100px;
     min-height: 130px;
     display: inline-block;
@@ -192,68 +184,68 @@
     line-height: 1.2;
 }
 
-* html .mediamanager-thumbs li {
+* html #mediamanager__page .filelist .thumbs li {
     display: inline;
 }
 
-*+html .mediamanager-thumbs li {
+*+html #mediamanager__page .filelist .thumbs li {
     display: inline;
 }
 
-.mediamanager-thumbs li .image,
-.mediamanager-thumbs li .image0 {
+#mediamanager__page .filelist .thumbs li .image,
+#mediamanager__page .filelist .thumbs li .image0 {
     width: 100%;
     height: 90px;
     display: block;
     overflow: hidden;
 }
 
-.mediamanager-thumbs li .image1 {
+#mediamanager__page .filelist .thumbs li .image1 {
     display: none;
 }
 
-.mediamanager-thumbs li .image span,
-.mediamanager-thumbs li .image0 span {
+#mediamanager__page .filelist .thumbs li .image span,
+#mediamanager__page .filelist .thumbs li .image0 span {
     vertical-align: middle;
     display: table-cell;
     width: 100px;
     height: 90px;
 }
 
-.mediamanager-thumbs li .name,
-.mediamanager-thumbs li .size,
-.mediamanager-thumbs li .filesize,
-.mediamanager-thumbs li .date {
+#mediamanager__page .filelist .thumbs li .name,
+#mediamanager__page .filelist .thumbs li .size,
+#mediamanager__page .filelist .thumbs li .filesize,
+#mediamanager__page .filelist .thumbs li .date {
     display: block;
     overflow: hidden;
     width: 90px;
     white-space: nowrap;
 }
 
-.mediamanager-thumbs li .name {
+#mediamanager__page .filelist .thumbs li .name {
     padding: 5px 0;
     font-weight: bold;
 }
 
-.mediamanager-thumbs li .date {
+#mediamanager__page .filelist .thumbs li .date {
     font-style: italic;
     white-space: normal;
 }
 
-.mediamanager-thumbs li input[type=checkbox] {
+#mediamanager__page .filelist .thumbs li input[type=checkbox] {
     display: none;
     float: left;
     margin: 3px;
 }
 
-.mediamanager-thumbs li:hover input[type=checkbox],
-.mediamanager-thumbs li input[type=checkbox]:checked {
+#mediamanager__page .filelist .thumbs li:hover input[type=checkbox],
+#mediamanager__page .filelist .thumbs li input[type=checkbox]:checked {
     display: block;
 }
 
 /* Files list view */
 
-.mediamanager-list li {
+#mediamanager__page .filelist .list li {
     list-style: none;
     display: block;
     position: relative;
@@ -264,12 +256,12 @@
     color: __text__;
 }
 
-.mediamanager-list li:nth-child(2n+1) {
+#mediamanager__page .filelist .list li:nth-child(2n+1) {
     background-color: __background_neu__;
 }
 
-.mediamanager-list li .image,
-.mediamanager-list li .image1 {
+#mediamanager__page .filelist .list li .image,
+#mediamanager__page .filelist .list li .image1 {
     width: 10%;
     display: block;
     overflow: hidden;
@@ -278,46 +270,46 @@
     text-align: center;
 }
 
-.mediamanager-list li .image0 {
+#mediamanager__page .filelist .list li .image0 {
     display: none;
 }
 
-.mediamanager-list li .name,
-.mediamanager-list li .size,
-.mediamanager-list li .filesize,
-.mediamanager-list li .date {
+#mediamanager__page .filelist .list li .name,
+#mediamanager__page .filelist .list li .size,
+#mediamanager__page .filelist .list li .filesize,
+#mediamanager__page .filelist .list li .date {
     overflow: hidden;
     float: left;
     margin-left: 1%;
     white-space: nowrap;
 }
 
-.mediamanager-list li .name {
+#mediamanager__page .filelist .list li .name {
     width: 30%;
     font-weight: bold;
 }
 
-.mediamanager-list li .size,
-.mediamanager-list li .filesize {
+#mediamanager__page .filelist .list li .size,
+#mediamanager__page .filelist .list li .filesize {
     width: 15%;
 }
 
-.mediamanager-list li .date {
+#mediamanager__page .filelist .list li .date {
     width: 20%;
 }
 
-.mediamanager-list li .date {
+#mediamanager__page .filelist .list li .date {
     font-style: italic;
     white-space: normal;
 }
 
-.mediamanager-list .icon {
+#mediamanager__page .filelist .list .icon {
     max-width: 16px;
     max-height: 16px;
 }
 
-.mediamanager-list li .image span,
-.mediamanager-list li .image1 span {
+#mediamanager__page .filelist .list li .image span,
+#mediamanager__page .filelist .list li .image1 span {
     vertical-align: middle;
     text-align: center;
     display: table-cell;
@@ -325,20 +317,20 @@
     height: 40px;
 }
 
-.mediamanager-list li input[type=checkbox] {
+#mediamanager__page .filelist .list li input[type=checkbox] {
     display: none;
     float: left;
     margin: 3px;
 }
 
-.mediamanager-list li:hover input[type=checkbox],
-.mediamanager-list li input[type=checkbox]:checked {
+#mediamanager__page .filelist .list li:hover input[type=checkbox],
+#mediamanager__page .filelist .list li input[type=checkbox]:checked {
     display: block;
 }
 
 /* Upload panel */
 
-#mediamanager__layout div.upload {
+#mediamanager__page div.upload {
     padding-bottom: 0.5em;
 }
 
@@ -440,7 +432,7 @@
 
 /* Image diff */
 
-#mediamanager__layout dl.img_tags dd.highlighted{
+#mediamanager__page dl.img_tags dd.highlighted{
     background-color: __highlight__;
 }
 
-- 
cgit v1.2.3


From 90f69556e88c39509172f5926ca29c1ae63e2103 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 10:28:31 +0100
Subject: media manager: re-newed CSS roughly (more to come)

---
 lib/tpl/default/mediamanager.css | 223 ++++++++++++++++++++-------------------
 1 file changed, 112 insertions(+), 111 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index b1905f8a0..e25c0c9f4 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -1,4 +1,5 @@
-/* Layout */
+
+/*____________ Layout ____________*/
 
 #mediamanager__page h1 {
     margin: 0 0 .5em;
@@ -8,19 +9,22 @@
     min-width: 840px;
     width: 100%;
     overflow-x: auto;
+    text-align: left;
 }
 
 #mediamanager__page .panel {
     float: left;
     margin-right: 10px;
 }
+#mediamanager__page .panel.file {
+    margin-right: 0;
+}
 
 #mediamanager__page .panelContent {
     overflow-y: auto;
     overflow-x: hidden;
     padding: 0;
     margin: 0;
-    text-align: left;
     position: relative;
 }
 
@@ -30,10 +34,7 @@
     padding: 10px 10px 8px;
     text-align: left;
     min-height: 20px;
-}
-
-#mediamanager__page .panelHeader .icon {
-    margin-right: 5px;
+    overflow: hidden;
 }
 
 #mediamanager__page .namespaces {
@@ -46,8 +47,8 @@
     min-width: 375px;
 }
 
-#mediamanager__page_detail {
-    width: 35%;
+#mediamanager__page .file {
+    /* width: 35%; @todo: needed? */
     min-width: 290px;
 }
 
@@ -65,107 +66,86 @@
     background-color: __background_alt__;
 }
 
-/* Namespaces tree */
+/*____________ Namespaces tree ____________*/
 
-#mediamanager__page .namespaces ul.idx {
+#mediamanager__page .namespaces h2 {
+    font-size: 1em;
+    display: inline-block;
+    border-width: 0;
+    padding: .3em .8em;
+    margin: 0 .3em 0 0;
+    border-radius: .5em .5em 0 0;
+    font-weight: normal;
+    background-color: __background_alt__;
+    color: __text__;
+}
+
+#mediamanager__page .namespaces ul {
     margin-left: .2em;
+    list-style: none;
 }
 
-#mediamanager__page .namespaces ul.idx ul {
+#mediamanager__page .namespaces ul ul {
     margin-left: 1em;
 }
 
-#mediamanager__page .namespaces ul.idx .selected {
+#mediamanager__page .namespaces ul .selected {
     background-color: __highlight__;
     font-weight: bold;
 }
 
-/* Tabs */
+/*____________ Panel header ____________*/
 
-#mediamanager__page div.panel h2.a11y {
-    font-weight: bold;
-    display: block;
+#mediamanager__page .panelHeader h3 {
     float: left;
-    padding: 10px;
-    padding-bottom: 5px;
-    padding-top: 5px;
-    margin-right: 2px;
-    -moz-border-radius-topright: 10px;
-    -webkit-border-top-right-radius: 10px;
-    -moz-border-radius-topleft: 10px;
-    -webkit-border-top-left-radius: 10px;
-    border-top-right-radius: 10px;
-    border-top-left-radius: 10px;
-}
-
-#mediamanager__page div.panel h2.a11y .selected {
-    background-color: __background_alt__;
+    font-weight: normal;
+    font-size: 1em;
+    padding: 0;
+    margin: 0;
 }
 
-#mediamanager__page div.panel h2.a11y a:hover {
-    background-color: __background_alt__;
-    opacity: 0.5;
+#mediamanager__page .panelHeader form.options {
+    float: right;
 }
 
-/* Title links */
-
-#mediamanager__page .filelist .panelHeader h3 {
-    float: left;
-    font-weight: normal;
+#mediamanager__page .panelHeader ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
 }
 
-#mediamanager__tabs_list {
-    float: left;
+#mediamanager__page .panelHeader form.options label span span {
+    display: none; /* @todo: hide accessibly */
 }
-
-#mediamanager__link_thumbs,
-#mediamanager__link_list {
-    padding-left: 30px;
-    display: inline-block;
-    width: 0;
-    overflow: hidden;
+#mediamanager__page .panelHeader form.options label span {
+    padding-left: 27px;
 }
-
-#mediamanager__link_thumbs {
+/* @todo: get different images */
+#mediamanager__page .panelHeader label.thumbs span {
     background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
-    margin-left: 10px;
 }
-
-#mediamanager__link_list {
+#mediamanager__page .panelHeader label.rows span {
     background: url('../../images/icon-list.png') 0 -4px no-repeat;
 }
-
-#mediamanager__link_thumbs:hover,
-#mediamanager__link_list:hover {
-    width: auto;
-    margin-right: 10px;
-}
-
-#mediamanager__sort {
+#mediamanager__page .panelHeader label.name span {
     background: url('../../images/icon-sort.png') 0 -4px no-repeat;
-    padding-left: 30px;
-    display: block;
-    float: right;
 }
-
-* html #mediamanager__sort,
-*+html #mediamanager__sort {
-    position: relative;
-    margin-top: -18px;
+#mediamanager__page .panelHeader label.date span {
+    background: url('../../images/icon-sort.png') 0 -4px no-repeat;
 }
 
-/* File list */
+/*____________ File list ____________*/
 
-#mediamanager__page .filelist .list {
+#mediamanager__page .filelist ul {
     padding: 0;
-    margin: 0 !important;
+    margin: 0;
 }
 
-#mediamanager__page .filelist .list li:hover {
+#mediamanager__page .filelist .panelContent ul li:hover {
     background-color: __background_alt__;
 }
 
-/* Files thumbs view */
+/* thumbs */
 
 #mediamanager__page .filelist .thumbs li {
     width: 100px;
@@ -204,8 +184,8 @@
     display: none;
 }
 
-#mediamanager__page .filelist .thumbs li .image span,
-#mediamanager__page .filelist .thumbs li .image0 span {
+#mediamanager__page .filelist .thumbs li .image,
+#mediamanager__page .filelist .thumbs li .image0 {
     vertical-align: middle;
     display: table-cell;
     width: 100px;
@@ -243,9 +223,13 @@
     display: block;
 }
 
-/* Files list view */
+/* rows */
 
-#mediamanager__page .filelist .list li {
+#mediamanager__page .filelist .rows li {
+    overflow: hidden;
+}
+
+#mediamanager__page .filelist .rows li {
     list-style: none;
     display: block;
     position: relative;
@@ -256,12 +240,12 @@
     color: __text__;
 }
 
-#mediamanager__page .filelist .list li:nth-child(2n+1) {
+#mediamanager__page .filelist .rows li:nth-child(2n+1) {
     background-color: __background_neu__;
 }
 
-#mediamanager__page .filelist .list li .image,
-#mediamanager__page .filelist .list li .image1 {
+#mediamanager__page .filelist .rows li .image,
+#mediamanager__page .filelist .rows li .image1 {
     width: 10%;
     display: block;
     overflow: hidden;
@@ -270,46 +254,46 @@
     text-align: center;
 }
 
-#mediamanager__page .filelist .list li .image0 {
+#mediamanager__page .filelist .rows li .image0 {
     display: none;
 }
 
-#mediamanager__page .filelist .list li .name,
-#mediamanager__page .filelist .list li .size,
-#mediamanager__page .filelist .list li .filesize,
-#mediamanager__page .filelist .list li .date {
+#mediamanager__page .filelist .rows li .name,
+#mediamanager__page .filelist .rows li .size,
+#mediamanager__page .filelist .rows li .filesize,
+#mediamanager__page .filelist .rows li .date {
     overflow: hidden;
     float: left;
     margin-left: 1%;
     white-space: nowrap;
 }
 
-#mediamanager__page .filelist .list li .name {
+#mediamanager__page .filelist .rows li .name {
     width: 30%;
     font-weight: bold;
 }
 
-#mediamanager__page .filelist .list li .size,
-#mediamanager__page .filelist .list li .filesize {
+#mediamanager__page .filelist .rows li .size,
+#mediamanager__page .filelist .rows li .filesize {
     width: 15%;
 }
 
-#mediamanager__page .filelist .list li .date {
+#mediamanager__page .filelist .rows li .date {
     width: 20%;
 }
 
-#mediamanager__page .filelist .list li .date {
+#mediamanager__page .filelist .rows li .date {
     font-style: italic;
     white-space: normal;
 }
 
-#mediamanager__page .filelist .list .icon {
+#mediamanager__page .filelist .rows .icon {
     max-width: 16px;
     max-height: 16px;
 }
 
-#mediamanager__page .filelist .list li .image span,
-#mediamanager__page .filelist .list li .image1 span {
+#mediamanager__page .filelist .rows li .image span,
+#mediamanager__page .filelist .rows li .image1 span {
     vertical-align: middle;
     text-align: center;
     display: table-cell;
@@ -317,18 +301,18 @@
     height: 40px;
 }
 
-#mediamanager__page .filelist .list li input[type=checkbox] {
+#mediamanager__page .filelist .rows li input[type=checkbox] {
     display: none;
     float: left;
     margin: 3px;
 }
 
-#mediamanager__page .filelist .list li:hover input[type=checkbox],
-#mediamanager__page .filelist .list li input[type=checkbox]:checked {
+#mediamanager__page .filelist .rows li:hover input[type=checkbox],
+#mediamanager__page .filelist .rows li input[type=checkbox]:checked {
     display: block;
 }
 
-/* Upload panel */
+/*____________ Upload panel ____________*/
 
 #mediamanager__page div.upload {
     padding-bottom: 0.5em;
@@ -339,57 +323,74 @@
     padding-bottom: 0.5em;
 }
 
-/* File preview */
+/*____________ File preview ____________*/
 
-.mediamanager__preview,
-.mediamanager__preview_buttons {
+#mediamanager__page .file ul.actions {
     text-align: center;
     margin-bottom: 5px;
+    list-style: none;
+}
+
+#mediamanager__page .file div.image {
+    margin-bottom: 5px;
 }
 
-.mediamanager__preview img {
+#mediamanager__page .file div.image img {
     width: 99%;
 }
 
-/* Meta data edit form */
+#mediamanager__page .file dl {
+}
+#mediamanager__page .file dl dt {
+    font-weight: bold;
+    display: block;
+    background-color: __background_alt__;
+}
+#mediamanager__page .file dl dd {
+    display: block;
+    background-color: __background_neu__;
+}
+
+
+/*____________ Meta data edit form ____________*/
 
-#mediamanager__details div.metafield {
+#mediamanager__page form.meta div.row {
     margin-bottom: 5px;
 }
 
-#mediamanager__details label {
+#mediamanager__page form.meta label {
     display: block;
 }
 
-#mediamanager__details form.meta input {
+#mediamanager__page form.meta input {
     width: 50%;
 }
 
-#mediamanager__details form.meta input.button {
+#mediamanager__page form.meta input.button {
     width: auto;
 }
 
-#mediamanager__details form.meta textarea.edit {
+#mediamanager__page form.meta textarea.edit {
     height: 6em;
     width: 95%;
     min-width: 95%;
     max-width: 95%;
 }
 
-/* Revisions form */
+/*____________ Revisions form ____________*/
 
-#mediamanager__details #page__revisions ul {
+#mediamanager__page #page__revisions ul {
     margin-left: 10px;
     list-style-type: none;
 }
 
-#mediamanager__details #page__revisions ul li div.li div {
+#mediamanager__page #page__revisions ul li div.li div {
     font-size: 90%;
     color: __text_neu__;
     padding-left: 18px;
 }
 
-#mediamanager__details #page__revisions ul li div.li input {
+#mediamanager__page #page__revisions ul li div.li input {
     position: relative;
     top: 1px;
 }
-- 
cgit v1.2.3


From eaac63bb6c71253d7c2d4817c7ffc40cf4f13aeb Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Sun, 18 Sep 2011 20:31:08 +0200
Subject: Fix mediamanager JS (diffs not yet working)

---
 lib/tpl/default/mediamanager.css | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index e25c0c9f4..a9728f299 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -401,15 +401,14 @@
     margin-top: 10px;
 }
 
-#mediamanager__diff_table {
+#mediamanager__diff table {
     padding: 0;
     margin: 0;
     margin-top: 10px;
 }
 
-#mediamanager__diff_table li {
+#mediamanager__diff table tr {
     width: 48%;
-    display: inline-block;
     margin: 0;
     margin-bottom: 10px;
     padding: 2px;
@@ -418,23 +417,24 @@
     color: __text__;
 }
 
-* html #mediamanager__diff_table li {
+* html #mediamanager__diff table tr {
     display: inline;
 }
 
-*+html #mediamanager__diff_table li {
+*+html #mediamanager__diff table tr {
     display: inline;
 }
 
 /* For IE7 */
-*:first-child+html #mediamanager__diff_table li {
+*:first-child+html #mediamanager__diff table tr {
     width: 45%;
 }
 
 /* Image diff */
 
-#mediamanager__page dl.img_tags dd.highlighted{
+#mediamanager__page dl.img_tags dd strong {
     background-color: __highlight__;
+    font-weight: normal;
 }
 
 #mediamanager__form_diffview {
@@ -451,8 +451,7 @@
     left: 0;
 }
 
-#mediamanager__diff_opacity_image1,
-#mediamanager__diff_portions_image1 {
+#mediamanager__diff div.image1 {
     width: 97%;
 }
 
@@ -460,21 +459,20 @@
     width: 100%;
 }
 
-#mediamanager__diff_opacity_image2 {
+#mediamanager__diff div.diff_opacity div.image2 {
     width: 97%;
     -moz-opacity: 0.5;
     -khtml-opacity: 0.5;
     opacity: 0.5;
 }
 
-#mediamanager__diff_portions_image2 {
+#mediamanager__diff div.diff_portions div.image2 {
     width: 97%;
     border-right: 1px solid red;
     overflow: hidden;
 }
 
-#mediamanager__opacity_slider,
-#mediamanager__portions_slider {
+#mediamanager__diff div.diff_slider {
     margin: 10px;
     width: 95%;
 }
-- 
cgit v1.2.3


From c57314fe779ba40a0d3d15fb315b7d6d9acfe730 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 19:47:19 +0100
Subject: media manager: more CSS changes

---
 lib/tpl/default/mediamanager.css | 116 +++++++++++++++------------------------
 1 file changed, 44 insertions(+), 72 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index e25c0c9f4..26f30fd3f 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -20,12 +20,17 @@
     margin-right: 0;
 }
 
-#mediamanager__page .panelContent {
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 0;
-    margin: 0;
-    position: relative;
+#mediamanager__page .namespaces {
+    width: 15%;
+    min-width: 125px;
+}
+#mediamanager__page .filelist {
+    width: 45%;
+    min-width: 375px;
+}
+#mediamanager__page .file {
+    width: 35%;
+    min-width: 290px;
 }
 
 #mediamanager__page .panelHeader {
@@ -37,19 +42,12 @@
     overflow: hidden;
 }
 
-#mediamanager__page .namespaces {
-    width: 15%;
-    min-width: 125px;
-}
-
-#mediamanager__page .filelist {
-    width: 45%;
-    min-width: 375px;
-}
-
-#mediamanager__page .file {
-    /* width: 35%; @todo: needed? */
-    min-width: 290px;
+#mediamanager__page .panelContent {
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 0;
+    margin: 0;
+    position: relative;
 }
 
 #mediamanager__page .ui-resizable-e {
@@ -58,7 +56,6 @@
     /* icon from Crystal Clear icon set (LGPL) */
     background: transparent url(images/resizecol.png) 0 25px no-repeat;
 }
-
 #mediamanager__page .ui-resizable-e:hover {
     width: 6px;
     right: -8px;
@@ -84,7 +81,6 @@
     margin-left: .2em;
     list-style: none;
 }
-
 #mediamanager__page .namespaces ul ul {
     margin-left: 1em;
 }
@@ -113,6 +109,10 @@
     margin: 0;
     padding: 0;
 }
+#mediamanager__page .panelHeader ul li {
+    color: __text__;
+    float: left;
+}
 
 #mediamanager__page .panelHeader form.options label span span {
     display: none; /* @todo: hide accessibly */
@@ -212,17 +212,6 @@
     white-space: normal;
 }
 
-#mediamanager__page .filelist .thumbs li input[type=checkbox] {
-    display: none;
-    float: left;
-    margin: 3px;
-}
-
-#mediamanager__page .filelist .thumbs li:hover input[type=checkbox],
-#mediamanager__page .filelist .thumbs li input[type=checkbox]:checked {
-    display: block;
-}
-
 /* rows */
 
 #mediamanager__page .filelist .rows li {
@@ -280,16 +269,12 @@
 
 #mediamanager__page .filelist .rows li .date {
     width: 20%;
-}
-
-#mediamanager__page .filelist .rows li .date {
     font-style: italic;
     white-space: normal;
 }
 
 #mediamanager__page .filelist .rows .icon {
-    max-width: 16px;
-    max-height: 16px;
+    margin-top: 12px;
 }
 
 #mediamanager__page .filelist .rows li .image span,
@@ -301,17 +286,6 @@
     height: 40px;
 }
 
-#mediamanager__page .filelist .rows li input[type=checkbox] {
-    display: none;
-    float: left;
-    margin: 3px;
-}
-
-#mediamanager__page .filelist .rows li:hover input[type=checkbox],
-#mediamanager__page .filelist .rows li input[type=checkbox]:checked {
-    display: block;
-}
-
 /*____________ Upload panel ____________*/
 
 #mediamanager__page div.upload {
@@ -330,6 +304,9 @@
     margin-bottom: 5px;
     list-style: none;
 }
+#mediamanager__page .file ul.actions li {
+    display: inline;
+}
 
 #mediamanager__page .file div.image {
     margin-bottom: 5px;
@@ -358,7 +335,7 @@
     margin-bottom: 5px;
 }
 
-#mediamanager__page form.meta label {
+#mediamanager__page form.meta label span {
     display: block;
 }
 
@@ -398,43 +375,38 @@
 /* File diff */
 
 #mediamanager__diff {
-    margin-top: 10px;
-}
-
-#mediamanager__diff_table {
-    padding: 0;
-    margin: 0;
-    margin-top: 10px;
 }
 
-#mediamanager__diff_table li {
+#mediamanager__diff td,
+#mediamanager__diff th {
     width: 48%;
-    display: inline-block;
-    margin: 0;
-    margin-bottom: 10px;
-    padding: 2px;
+    margin: 0 5px 10px 0;
+    padding: 0;
     vertical-align: top;
-    zoom: 1;
-    color: __text__;
+    text-align: left;
 }
 
-* html #mediamanager__diff_table li {
-    display: inline;
+/* For IE7 */
+*:first-child+html #mediamanager__diff td {
+    width: 45%;
 }
 
-*+html #mediamanager__diff_table li {
-    display: inline;
+#mediamanager__diff th {
+    font-weight: normal;
 }
-
-/* For IE7 */
-*:first-child+html #mediamanager__diff_table li {
-    width: 45%;
+#mediamanager__diff th a {
+    font-weight: bold;
+}
+#mediamanager__diff th span {
+    font-size: 90%;
 }
 
 /* Image diff */
 
-#mediamanager__page dl.img_tags dd.highlighted{
+#mediamanager__diff dl dd strong{
     background-color: __highlight__;
+    color: __text__;
+    font-weight: normal;
 }
 
 #mediamanager__form_diffview {
-- 
cgit v1.2.3


From 359d5431e4665f7e2cae1e77e865a00b47f1b02c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Sep 2011 20:19:58 +0100
Subject: media manager: styled new option buttons

---
 lib/tpl/default/mediamanager.css | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index ca1626f90..21167af05 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -102,6 +102,7 @@
 
 #mediamanager__page .panelHeader form.options {
     float: right;
+    margin-top: -3px;
 }
 
 #mediamanager__page .panelHeader ul {
@@ -112,26 +113,24 @@
 #mediamanager__page .panelHeader ul li {
     color: __text__;
     float: left;
+    line-height: 1;
 }
 
-#mediamanager__page .panelHeader form.options label span span {
-    display: none; /* @todo: hide accessibly */
-}
-#mediamanager__page .panelHeader form.options label span {
+#mediamanager__page .panelHeader ul li.listType {
     padding-left: 27px;
+    background: url('../../images/icon-list.png') 0 1px no-repeat;
 }
-/* @todo: get different images */
-#mediamanager__page .panelHeader label.thumbs span {
-    background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
-}
-#mediamanager__page .panelHeader label.rows span {
-    background: url('../../images/icon-list.png') 0 -4px no-repeat;
+#mediamanager__page .panelHeader ul li.sortBy {
+    padding-left: 27px;
+    background: url('../../images/icon-sort.png') 0 1px no-repeat;
 }
-#mediamanager__page .panelHeader label.name span {
-    background: url('../../images/icon-sort.png') 0 -4px no-repeat;
+
+#mediamanager__page .panelHeader form.options .ui-buttonset label{
+    font-size: 90%;
 }
-#mediamanager__page .panelHeader label.date span {
-    background: url('../../images/icon-sort.png') 0 -4px no-repeat;
+#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
+    padding: .4em .7em;
+    line-height: 1;
 }
 
 /*____________ File list ____________*/
-- 
cgit v1.2.3


From 699c5072ff1d0470c53299ab9a4dfbb4457e7843 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 00:28:25 +0100
Subject: media manager: small functionality and css changes

---
 lib/tpl/default/mediamanager.css | 73 ++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 44 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 21167af05..d098686f0 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -75,6 +75,7 @@
     font-weight: normal;
     background-color: __background_alt__;
     color: __text__;
+    line-height: 1.5em;
 }
 
 #mediamanager__page .namespaces ul {
@@ -117,7 +118,7 @@
 }
 
 #mediamanager__page .panelHeader ul li.listType {
-    padding-left: 27px;
+    padding: 0 3px 0 27px;
     background: url('../../images/icon-list.png') 0 1px no-repeat;
 }
 #mediamanager__page .panelHeader ul li.sortBy {
@@ -127,6 +128,7 @@
 
 #mediamanager__page .panelHeader form.options .ui-buttonset label{
     font-size: 90%;
+    margin-right: -0.4em;
 }
 #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
     padding: .4em .7em;
@@ -158,37 +160,26 @@
     padding: 5px;
     vertical-align: top;
     text-align: center;
-    zoom: 1;
     position: relative;
     line-height: 1.2;
 }
-
 * html #mediamanager__page .filelist .thumbs li {
     display: inline;
+    zoom: 1;
 }
-
 *+html #mediamanager__page .filelist .thumbs li {
     display: inline;
 }
 
-#mediamanager__page .filelist .thumbs li .image,
-#mediamanager__page .filelist .thumbs li .image0 {
-    width: 100%;
-    height: 90px;
-    display: block;
-    overflow: hidden;
-}
-
-#mediamanager__page .filelist .thumbs li .image1 {
-    display: none;
-}
-
-#mediamanager__page .filelist .thumbs li .image,
-#mediamanager__page .filelist .thumbs li .image0 {
+#mediamanager__page .filelist .thumbs li .image {
     vertical-align: middle;
     display: table-cell;
     width: 100px;
     height: 90px;
+    overflow: hidden;
+}
+#mediamanager__page .filelist .thumbs li .tiny {
+    display: none;
 }
 
 #mediamanager__page .filelist .thumbs li .name,
@@ -200,12 +191,10 @@
     width: 90px;
     white-space: nowrap;
 }
-
 #mediamanager__page .filelist .thumbs li .name {
     padding: 5px 0;
     font-weight: bold;
 }
-
 #mediamanager__page .filelist .thumbs li .date {
     font-style: italic;
     white-space: normal;
@@ -213,10 +202,6 @@
 
 /* rows */
 
-#mediamanager__page .filelist .rows li {
-    overflow: hidden;
-}
-
 #mediamanager__page .filelist .rows li {
     list-style: none;
     display: block;
@@ -226,14 +211,14 @@
     margin-bottom: 3px;
     background-color: __background__;
     color: __text__;
+    overflow: hidden;
 }
 
 #mediamanager__page .filelist .rows li:nth-child(2n+1) {
     background-color: __background_neu__;
 }
 
-#mediamanager__page .filelist .rows li .image,
-#mediamanager__page .filelist .rows li .image1 {
+#mediamanager__page .filelist .rows li .image {
     width: 10%;
     display: block;
     overflow: hidden;
@@ -241,11 +226,21 @@
     height: 40px;
     text-align: center;
 }
-
-#mediamanager__page .filelist .rows li .image0 {
+#mediamanager__page .filelist .rows li .thumb {
     display: none;
 }
 
+#mediamanager__page .filelist .rows li .image span {
+    vertical-align: middle;
+    text-align: center;
+    display: table-cell;
+    width: 100px;
+    height: 40px;
+}
+#mediamanager__page .filelist .rows .icon {
+    margin-top: 12px;
+}
+
 #mediamanager__page .filelist .rows li .name,
 #mediamanager__page .filelist .rows li .size,
 #mediamanager__page .filelist .rows li .filesize,
@@ -260,31 +255,16 @@
     width: 30%;
     font-weight: bold;
 }
-
 #mediamanager__page .filelist .rows li .size,
 #mediamanager__page .filelist .rows li .filesize {
     width: 15%;
 }
-
 #mediamanager__page .filelist .rows li .date {
     width: 20%;
     font-style: italic;
     white-space: normal;
 }
 
-#mediamanager__page .filelist .rows .icon {
-    margin-top: 12px;
-}
-
-#mediamanager__page .filelist .rows li .image span,
-#mediamanager__page .filelist .rows li .image1 span {
-    vertical-align: middle;
-    text-align: center;
-    display: table-cell;
-    width: 100px;
-    height: 40px;
-}
-
 /*____________ Upload panel ____________*/
 
 #mediamanager__page div.upload {
@@ -300,7 +280,7 @@
 
 #mediamanager__page .file ul.actions {
     text-align: center;
-    margin-bottom: 5px;
+    margin: 0 0 5px;
     list-style: none;
 }
 #mediamanager__page .file ul.actions li {
@@ -410,8 +390,13 @@
 
 #mediamanager__form_diffview {
     margin-bottom: 10px;
+    display: block;
 }
 
+
+
+
+
 #mediamanager__diff_layout {
     position: relative;
 }
-- 
cgit v1.2.3


From 94add30314d7c0ed51fa78304ca342d0273b366c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 01:22:32 +0100
Subject: media manager: added a few newlines to the output

---
 lib/tpl/default/mediamanager.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index d098686f0..f21c936f8 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -130,6 +130,9 @@
     font-size: 90%;
     margin-right: -0.4em;
 }
+#mediamanager__page .panelHeader form.options label span span{
+    display: none;
+}
 #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
     padding: .4em .7em;
     line-height: 1;
-- 
cgit v1.2.3


From 1a4e6b1daf57352634e12ce4837b1738efaeed81 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 10:28:41 +0100
Subject: media manager: fixed option buttons (broken with 94add30)

---
 lib/tpl/default/mediamanager.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index f21c936f8..9f68fdb3e 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -130,9 +130,11 @@
     font-size: 90%;
     margin-right: -0.4em;
 }
+/*
 #mediamanager__page .panelHeader form.options label span span{
     display: none;
 }
+*/
 #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
     padding: .4em .7em;
     line-height: 1;
-- 
cgit v1.2.3


From fba0b25db639efd576e78d9a4258de5c8ef916b6 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 19 Sep 2011 11:00:23 +0100
Subject: media manager: improved spacing around option buttons and changed
 lang strings for them

---
 lib/tpl/default/mediamanager.css | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 9f68fdb3e..e61d07842 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -98,7 +98,7 @@
     font-weight: normal;
     font-size: 1em;
     padding: 0;
-    margin: 0;
+    margin: 0 0 3px;
 }
 
 #mediamanager__page .panelHeader form.options {
@@ -115,26 +115,22 @@
     color: __text__;
     float: left;
     line-height: 1;
+    padding-left: 3px;
 }
 
 #mediamanager__page .panelHeader ul li.listType {
-    padding: 0 3px 0 27px;
-    background: url('../../images/icon-list.png') 0 1px no-repeat;
+    padding-left: 30px;
+    background: url('../../images/icon-list.png') 3px 1px no-repeat;
 }
 #mediamanager__page .panelHeader ul li.sortBy {
-    padding-left: 27px;
-    background: url('../../images/icon-sort.png') 0 1px no-repeat;
+    padding-left: 30px;
+    background: url('../../images/icon-sort.png') 3px 1px no-repeat;
 }
 
 #mediamanager__page .panelHeader form.options .ui-buttonset label{
     font-size: 90%;
     margin-right: -0.4em;
 }
-/*
-#mediamanager__page .panelHeader form.options label span span{
-    display: none;
-}
-*/
 #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
     padding: .4em .7em;
     line-height: 1;
-- 
cgit v1.2.3


From bc314c5832351325feac48564dae39a93321d99a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 20 Sep 2011 10:47:46 +0100
Subject: media manager: improved the panel widths

---
 lib/tpl/default/mediamanager.css | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index e61d07842..a83bb19cc 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -6,36 +6,31 @@
 }
 
 #mediamanager__page {
-    min-width: 840px;
+    min-width: 800px;
     width: 100%;
-    overflow-x: auto;
     text-align: left;
 }
 
 #mediamanager__page .panel {
     float: left;
-    margin-right: 10px;
-}
-#mediamanager__page .panel.file {
-    margin-right: 0;
 }
 
 #mediamanager__page .namespaces {
     width: 15%;
-    min-width: 125px;
+    min-width: 120px;
 }
 #mediamanager__page .filelist {
-    width: 45%;
-    min-width: 375px;
+    width: 50%;
+    min-width: 400px;
 }
 #mediamanager__page .file {
     width: 35%;
-    min-width: 290px;
+    min-width: 280px;
 }
 
 #mediamanager__page .panelHeader {
     background-color: __background_alt__;
-    margin-bottom: 10px;
+    margin: 0 10px 10px 0;
     padding: 10px 10px 8px;
     text-align: left;
     min-height: 20px;
@@ -46,19 +41,24 @@
     overflow-y: auto;
     overflow-x: hidden;
     padding: 0;
-    margin: 0;
+    margin: 0 10px 10px 0;
     position: relative;
 }
 
+#mediamanager__page .file .panelHeader,
+#mediamanager__page .file .panelContent {
+    margin-right: 0;
+}
+
 #mediamanager__page .ui-resizable-e {
     width: 16px;
-    right: -13px;
+    right: -3px;
     /* icon from Crystal Clear icon set (LGPL) */
     background: transparent url(images/resizecol.png) 0 25px no-repeat;
 }
 #mediamanager__page .ui-resizable-e:hover {
     width: 6px;
-    right: -8px;
+    right: 2px;
     background-image: none;
     background-color: __background_alt__;
 }
@@ -290,10 +290,11 @@
 
 #mediamanager__page .file div.image {
     margin-bottom: 5px;
+    text-align: center;
 }
 
 #mediamanager__page .file div.image img {
-    width: 99%;
+    width: 100%;
 }
 
 #mediamanager__page .file dl {
-- 
cgit v1.2.3


From 33e91473c28e8f1c8542459bb4d755beb620305e Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Thu, 22 Sep 2011 21:37:33 +0200
Subject: Resize images in fullscreen mediamanager using CSS

---
 lib/tpl/default/mediamanager.css | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 9d2930af6..619ca9929 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -175,8 +175,10 @@
     height: 90px;
     overflow: hidden;
 }
-#mediamanager__page .filelist .thumbs li .tiny {
-    display: none;
+
+#mediamanager__page .filelist .thumbs li .thumb img {
+    max-width: 90px;
+    max-height: 90px;
 }
 
 #mediamanager__page .filelist .thumbs li .name,
@@ -223,8 +225,10 @@
     height: 40px;
     text-align: center;
 }
-#mediamanager__page .filelist .rows li .thumb {
-    display: none;
+
+#mediamanager__page .filelist .rows li .thumb img {
+    max-width: 40px;
+    max-height: 40px;
 }
 
 #mediamanager__page .filelist .rows li .image span {
-- 
cgit v1.2.3


From 9a71fb5c963f2943a45bc4d0c77a84dd788e17b3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 25 Sep 2011 11:47:53 +0100
Subject: media manager: fixed and improved diff views

---
 lib/tpl/default/mediamanager.css | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index 619ca9929..03c2cb9ce 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -382,55 +382,47 @@
     font-size: 90%;
 }
 
-/* Image diff */
-
 #mediamanager__diff dl dd strong{
     background-color: __highlight__;
     color: __text__;
     font-weight: normal;
 }
 
-#mediamanager__form_diffview {
+/* Image diff */
+
+#mediamanager__page .file form.diffView {
     margin-bottom: 10px;
     display: block;
 }
 
+#mediamanager__diff div.slider {
+    margin: 10px;
+    width: 95%;
+}
 
-
-
-
-#mediamanager__diff_layout {
+#mediamanager__diff .imageDiff {
     position: relative;
 }
-
-#mediamanager__diff_layout div {
+#mediamanager__diff .imageDiff .image1,
+#mediamanager__diff .imageDiff .image2 {
     position: absolute;
     top: 0;
     left: 0;
-}
-
-#mediamanager__diff div.image1 {
     width: 97%;
 }
 
-#mediamanager__diff_layout div img {
-    width: 100%;
-}
-
-#mediamanager__diff div.diff_opacity div.image2 {
-    width: 97%;
+#mediamanager__diff .imageDiff.opacity .image2 {
     -moz-opacity: 0.5;
     -khtml-opacity: 0.5;
     opacity: 0.5;
 }
 
-#mediamanager__diff div.diff_portions div.image2 {
-    width: 97%;
+#mediamanager__diff .imageDiff.portions .image2 {
     border-right: 1px solid red;
     overflow: hidden;
 }
 
-#mediamanager__diff div.diff_slider {
-    margin: 10px;
-    width: 95%;
+#mediamanager__diff .imageDiff img {
+    width: 100%;
 }
+
-- 
cgit v1.2.3


From 6087dde90bed311b68f1999f55ac81fe78c63c2b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 25 Sep 2011 16:56:43 +0100
Subject: renamed mediamanager.css to start with underscore

---
 lib/tpl/default/_mediamanager.css | 428 ++++++++++++++++++++++++++++++++++++++
 lib/tpl/default/mediamanager.css  | 428 --------------------------------------
 lib/tpl/default/style.ini         |   2 +-
 3 files changed, 429 insertions(+), 429 deletions(-)
 create mode 100644 lib/tpl/default/_mediamanager.css
 delete mode 100644 lib/tpl/default/mediamanager.css

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
new file mode 100644
index 000000000..03c2cb9ce
--- /dev/null
+++ b/lib/tpl/default/_mediamanager.css
@@ -0,0 +1,428 @@
+
+/*____________ Layout ____________*/
+
+#mediamanager__page h1 {
+    margin: 0 0 .5em;
+}
+
+#mediamanager__page {
+    min-width: 800px;
+    width: 100%;
+    text-align: left;
+}
+
+#mediamanager__page .panel {
+    float: left;
+}
+
+#mediamanager__page .namespaces {
+    width: 15%;
+    min-width: 120px;
+}
+#mediamanager__page .filelist {
+    width: 50%;
+    min-width: 400px;
+}
+#mediamanager__page .file {
+    width: 35%;
+    min-width: 280px;
+}
+
+#mediamanager__page .panelHeader {
+    background-color: __background_alt__;
+    margin: 0 10px 10px 0;
+    padding: 10px 10px 8px;
+    text-align: left;
+    min-height: 20px;
+    overflow: hidden;
+}
+
+#mediamanager__page .panelContent {
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding: 0;
+    margin: 0 10px 10px 0;
+    position: relative;
+}
+
+#mediamanager__page .file .panelHeader,
+#mediamanager__page .file .panelContent {
+    margin-right: 0;
+}
+
+#mediamanager__page .ui-resizable-e {
+    width: 6px;
+    right: 2px;
+    background: transparent url(images/resizecol.png) center center no-repeat;
+}
+#mediamanager__page .ui-resizable-e:hover {
+    background-color: __background_alt__;
+}
+
+/*____________ Namespaces tree ____________*/
+
+#mediamanager__page .namespaces h2 {
+    font-size: 1em;
+    display: inline-block;
+    border-width: 0;
+    padding: .3em .8em;
+    margin: 0 .3em 0 0;
+    border-radius: .5em .5em 0 0;
+    font-weight: normal;
+    background-color: __background_alt__;
+    color: __text__;
+    line-height: 1.5em;
+}
+
+#mediamanager__page .namespaces ul {
+    margin-left: .2em;
+    list-style: none;
+}
+#mediamanager__page .namespaces ul ul {
+    margin-left: 1em;
+}
+
+#mediamanager__page .namespaces ul .selected {
+    background-color: __highlight__;
+    font-weight: bold;
+}
+
+/*____________ Panel header ____________*/
+
+#mediamanager__page .panelHeader h3 {
+    float: left;
+    font-weight: normal;
+    font-size: 1em;
+    padding: 0;
+    margin: 0 0 3px;
+}
+
+#mediamanager__page .panelHeader form.options {
+    float: right;
+    margin-top: -3px;
+}
+
+#mediamanager__page .panelHeader ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+#mediamanager__page .panelHeader ul li {
+    color: __text__;
+    float: left;
+    line-height: 1;
+    padding-left: 3px;
+}
+
+#mediamanager__page .panelHeader ul li.listType {
+    padding-left: 30px;
+    background: url('../../images/icon-list.png') 3px 1px no-repeat;
+}
+#mediamanager__page .panelHeader ul li.sortBy {
+    padding-left: 30px;
+    background: url('../../images/icon-sort.png') 3px 1px no-repeat;
+}
+
+#mediamanager__page .panelHeader form.options .ui-buttonset label{
+    font-size: 90%;
+    margin-right: -0.4em;
+}
+#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
+    padding: .4em .7em;
+    line-height: 1;
+}
+
+/*____________ File list ____________*/
+
+#mediamanager__page .filelist ul {
+    padding: 0;
+    margin: 0;
+}
+
+#mediamanager__page .filelist .panelContent ul li:hover {
+    background-color: __background_alt__;
+}
+
+/* thumbs */
+
+#mediamanager__page .filelist .thumbs li {
+    width: 100px;
+    min-height: 130px;
+    display: inline-block;
+    display: -moz-inline-stack;
+    /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
+    margin: 0 6px 10px 0;
+    background-color: __background_neu__;
+    color: __text__;
+    padding: 5px;
+    vertical-align: top;
+    text-align: center;
+    position: relative;
+    line-height: 1.2;
+}
+* html #mediamanager__page .filelist .thumbs li {
+    display: inline;
+    zoom: 1;
+}
+*+html #mediamanager__page .filelist .thumbs li {
+    display: inline;
+}
+
+#mediamanager__page .filelist .thumbs li .image {
+    vertical-align: middle;
+    display: table-cell;
+    width: 100px;
+    height: 90px;
+    overflow: hidden;
+}
+
+#mediamanager__page .filelist .thumbs li .thumb img {
+    max-width: 90px;
+    max-height: 90px;
+}
+
+#mediamanager__page .filelist .thumbs li .name,
+#mediamanager__page .filelist .thumbs li .size,
+#mediamanager__page .filelist .thumbs li .filesize,
+#mediamanager__page .filelist .thumbs li .date {
+    display: block;
+    overflow: hidden;
+    width: 90px;
+    white-space: nowrap;
+}
+#mediamanager__page .filelist .thumbs li .name {
+    padding: 5px 0;
+    font-weight: bold;
+}
+#mediamanager__page .filelist .thumbs li .date {
+    font-style: italic;
+    white-space: normal;
+}
+
+/* rows */
+
+#mediamanager__page .filelist .rows li {
+    list-style: none;
+    display: block;
+    position: relative;
+    max-height: 50px;
+    margin: 0;
+    margin-bottom: 3px;
+    background-color: __background__;
+    color: __text__;
+    overflow: hidden;
+}
+
+#mediamanager__page .filelist .rows li:nth-child(2n+1) {
+    background-color: __background_neu__;
+}
+
+#mediamanager__page .filelist .rows li .image {
+    width: 10%;
+    display: block;
+    overflow: hidden;
+    float: left;
+    height: 40px;
+    text-align: center;
+}
+
+#mediamanager__page .filelist .rows li .thumb img {
+    max-width: 40px;
+    max-height: 40px;
+}
+
+#mediamanager__page .filelist .rows li .image span {
+    vertical-align: middle;
+    text-align: center;
+    display: table-cell;
+    width: 100px;
+    height: 40px;
+}
+#mediamanager__page .filelist .rows .icon {
+    margin-top: 12px;
+}
+
+#mediamanager__page .filelist .rows li .name,
+#mediamanager__page .filelist .rows li .size,
+#mediamanager__page .filelist .rows li .filesize,
+#mediamanager__page .filelist .rows li .date {
+    overflow: hidden;
+    float: left;
+    margin-left: 1%;
+    white-space: nowrap;
+}
+
+#mediamanager__page .filelist .rows li .name {
+    width: 30%;
+    font-weight: bold;
+}
+#mediamanager__page .filelist .rows li .size,
+#mediamanager__page .filelist .rows li .filesize {
+    width: 15%;
+}
+#mediamanager__page .filelist .rows li .date {
+    width: 20%;
+    font-style: italic;
+    white-space: normal;
+}
+
+/*____________ Upload panel ____________*/
+
+#mediamanager__page div.upload {
+    padding-bottom: 0.5em;
+}
+
+#media__content #mediamanager__uploader {
+    border-bottom: 1px solid __border__;
+    padding-bottom: 0.5em;
+}
+
+/*____________ File preview ____________*/
+
+#mediamanager__page .file ul.actions {
+    text-align: center;
+    margin: 0 0 5px;
+    list-style: none;
+}
+#mediamanager__page .file ul.actions li {
+    display: inline;
+}
+
+#mediamanager__page .file div.image {
+    margin-bottom: 5px;
+    text-align: center;
+}
+
+#mediamanager__page .file div.image img {
+    width: 100%;
+}
+
+#mediamanager__page .file dl {
+}
+#mediamanager__page .file dl dt {
+    font-weight: bold;
+    display: block;
+    background-color: __background_alt__;
+}
+#mediamanager__page .file dl dd {
+    display: block;
+    background-color: __background_neu__;
+}
+
+
+/*____________ Meta data edit form ____________*/
+
+#mediamanager__page form.meta div.row {
+    margin-bottom: 5px;
+}
+
+#mediamanager__page form.meta label span {
+    display: block;
+}
+
+#mediamanager__page form.meta input {
+    width: 50%;
+}
+
+#mediamanager__page form.meta input.button {
+    width: auto;
+}
+
+#mediamanager__page form.meta textarea.edit {
+    height: 6em;
+    width: 95%;
+    min-width: 95%;
+    max-width: 95%;
+}
+
+/*____________ Revisions form ____________*/
+
+#mediamanager__page #page__revisions ul {
+    margin-left: 10px;
+    list-style-type: none;
+}
+
+#mediamanager__page #page__revisions ul li div.li div {
+    font-size: 90%;
+    color: __text_neu__;
+    padding-left: 18px;
+}
+
+#mediamanager__page #page__revisions ul li div.li input {
+    position: relative;
+    top: 1px;
+}
+
+/* File diff */
+
+#mediamanager__diff {
+}
+
+#mediamanager__diff td,
+#mediamanager__diff th {
+    width: 48%;
+    margin: 0 5px 10px 0;
+    padding: 0;
+    vertical-align: top;
+    text-align: left;
+}
+
+/* For IE7 */
+*:first-child+html #mediamanager__diff td {
+    width: 45%;
+}
+
+#mediamanager__diff th {
+    font-weight: normal;
+}
+#mediamanager__diff th a {
+    font-weight: bold;
+}
+#mediamanager__diff th span {
+    font-size: 90%;
+}
+
+#mediamanager__diff dl dd strong{
+    background-color: __highlight__;
+    color: __text__;
+    font-weight: normal;
+}
+
+/* Image diff */
+
+#mediamanager__page .file form.diffView {
+    margin-bottom: 10px;
+    display: block;
+}
+
+#mediamanager__diff div.slider {
+    margin: 10px;
+    width: 95%;
+}
+
+#mediamanager__diff .imageDiff {
+    position: relative;
+}
+#mediamanager__diff .imageDiff .image1,
+#mediamanager__diff .imageDiff .image2 {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 97%;
+}
+
+#mediamanager__diff .imageDiff.opacity .image2 {
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
+    opacity: 0.5;
+}
+
+#mediamanager__diff .imageDiff.portions .image2 {
+    border-right: 1px solid red;
+    overflow: hidden;
+}
+
+#mediamanager__diff .imageDiff img {
+    width: 100%;
+}
+
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
deleted file mode 100644
index 03c2cb9ce..000000000
--- a/lib/tpl/default/mediamanager.css
+++ /dev/null
@@ -1,428 +0,0 @@
-
-/*____________ Layout ____________*/
-
-#mediamanager__page h1 {
-    margin: 0 0 .5em;
-}
-
-#mediamanager__page {
-    min-width: 800px;
-    width: 100%;
-    text-align: left;
-}
-
-#mediamanager__page .panel {
-    float: left;
-}
-
-#mediamanager__page .namespaces {
-    width: 15%;
-    min-width: 120px;
-}
-#mediamanager__page .filelist {
-    width: 50%;
-    min-width: 400px;
-}
-#mediamanager__page .file {
-    width: 35%;
-    min-width: 280px;
-}
-
-#mediamanager__page .panelHeader {
-    background-color: __background_alt__;
-    margin: 0 10px 10px 0;
-    padding: 10px 10px 8px;
-    text-align: left;
-    min-height: 20px;
-    overflow: hidden;
-}
-
-#mediamanager__page .panelContent {
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 0;
-    margin: 0 10px 10px 0;
-    position: relative;
-}
-
-#mediamanager__page .file .panelHeader,
-#mediamanager__page .file .panelContent {
-    margin-right: 0;
-}
-
-#mediamanager__page .ui-resizable-e {
-    width: 6px;
-    right: 2px;
-    background: transparent url(images/resizecol.png) center center no-repeat;
-}
-#mediamanager__page .ui-resizable-e:hover {
-    background-color: __background_alt__;
-}
-
-/*____________ Namespaces tree ____________*/
-
-#mediamanager__page .namespaces h2 {
-    font-size: 1em;
-    display: inline-block;
-    border-width: 0;
-    padding: .3em .8em;
-    margin: 0 .3em 0 0;
-    border-radius: .5em .5em 0 0;
-    font-weight: normal;
-    background-color: __background_alt__;
-    color: __text__;
-    line-height: 1.5em;
-}
-
-#mediamanager__page .namespaces ul {
-    margin-left: .2em;
-    list-style: none;
-}
-#mediamanager__page .namespaces ul ul {
-    margin-left: 1em;
-}
-
-#mediamanager__page .namespaces ul .selected {
-    background-color: __highlight__;
-    font-weight: bold;
-}
-
-/*____________ Panel header ____________*/
-
-#mediamanager__page .panelHeader h3 {
-    float: left;
-    font-weight: normal;
-    font-size: 1em;
-    padding: 0;
-    margin: 0 0 3px;
-}
-
-#mediamanager__page .panelHeader form.options {
-    float: right;
-    margin-top: -3px;
-}
-
-#mediamanager__page .panelHeader ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-#mediamanager__page .panelHeader ul li {
-    color: __text__;
-    float: left;
-    line-height: 1;
-    padding-left: 3px;
-}
-
-#mediamanager__page .panelHeader ul li.listType {
-    padding-left: 30px;
-    background: url('../../images/icon-list.png') 3px 1px no-repeat;
-}
-#mediamanager__page .panelHeader ul li.sortBy {
-    padding-left: 30px;
-    background: url('../../images/icon-sort.png') 3px 1px no-repeat;
-}
-
-#mediamanager__page .panelHeader form.options .ui-buttonset label{
-    font-size: 90%;
-    margin-right: -0.4em;
-}
-#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
-    padding: .4em .7em;
-    line-height: 1;
-}
-
-/*____________ File list ____________*/
-
-#mediamanager__page .filelist ul {
-    padding: 0;
-    margin: 0;
-}
-
-#mediamanager__page .filelist .panelContent ul li:hover {
-    background-color: __background_alt__;
-}
-
-/* thumbs */
-
-#mediamanager__page .filelist .thumbs li {
-    width: 100px;
-    min-height: 130px;
-    display: inline-block;
-    display: -moz-inline-stack;
-    /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
-    margin: 0 6px 10px 0;
-    background-color: __background_neu__;
-    color: __text__;
-    padding: 5px;
-    vertical-align: top;
-    text-align: center;
-    position: relative;
-    line-height: 1.2;
-}
-* html #mediamanager__page .filelist .thumbs li {
-    display: inline;
-    zoom: 1;
-}
-*+html #mediamanager__page .filelist .thumbs li {
-    display: inline;
-}
-
-#mediamanager__page .filelist .thumbs li .image {
-    vertical-align: middle;
-    display: table-cell;
-    width: 100px;
-    height: 90px;
-    overflow: hidden;
-}
-
-#mediamanager__page .filelist .thumbs li .thumb img {
-    max-width: 90px;
-    max-height: 90px;
-}
-
-#mediamanager__page .filelist .thumbs li .name,
-#mediamanager__page .filelist .thumbs li .size,
-#mediamanager__page .filelist .thumbs li .filesize,
-#mediamanager__page .filelist .thumbs li .date {
-    display: block;
-    overflow: hidden;
-    width: 90px;
-    white-space: nowrap;
-}
-#mediamanager__page .filelist .thumbs li .name {
-    padding: 5px 0;
-    font-weight: bold;
-}
-#mediamanager__page .filelist .thumbs li .date {
-    font-style: italic;
-    white-space: normal;
-}
-
-/* rows */
-
-#mediamanager__page .filelist .rows li {
-    list-style: none;
-    display: block;
-    position: relative;
-    max-height: 50px;
-    margin: 0;
-    margin-bottom: 3px;
-    background-color: __background__;
-    color: __text__;
-    overflow: hidden;
-}
-
-#mediamanager__page .filelist .rows li:nth-child(2n+1) {
-    background-color: __background_neu__;
-}
-
-#mediamanager__page .filelist .rows li .image {
-    width: 10%;
-    display: block;
-    overflow: hidden;
-    float: left;
-    height: 40px;
-    text-align: center;
-}
-
-#mediamanager__page .filelist .rows li .thumb img {
-    max-width: 40px;
-    max-height: 40px;
-}
-
-#mediamanager__page .filelist .rows li .image span {
-    vertical-align: middle;
-    text-align: center;
-    display: table-cell;
-    width: 100px;
-    height: 40px;
-}
-#mediamanager__page .filelist .rows .icon {
-    margin-top: 12px;
-}
-
-#mediamanager__page .filelist .rows li .name,
-#mediamanager__page .filelist .rows li .size,
-#mediamanager__page .filelist .rows li .filesize,
-#mediamanager__page .filelist .rows li .date {
-    overflow: hidden;
-    float: left;
-    margin-left: 1%;
-    white-space: nowrap;
-}
-
-#mediamanager__page .filelist .rows li .name {
-    width: 30%;
-    font-weight: bold;
-}
-#mediamanager__page .filelist .rows li .size,
-#mediamanager__page .filelist .rows li .filesize {
-    width: 15%;
-}
-#mediamanager__page .filelist .rows li .date {
-    width: 20%;
-    font-style: italic;
-    white-space: normal;
-}
-
-/*____________ Upload panel ____________*/
-
-#mediamanager__page div.upload {
-    padding-bottom: 0.5em;
-}
-
-#media__content #mediamanager__uploader {
-    border-bottom: 1px solid __border__;
-    padding-bottom: 0.5em;
-}
-
-/*____________ File preview ____________*/
-
-#mediamanager__page .file ul.actions {
-    text-align: center;
-    margin: 0 0 5px;
-    list-style: none;
-}
-#mediamanager__page .file ul.actions li {
-    display: inline;
-}
-
-#mediamanager__page .file div.image {
-    margin-bottom: 5px;
-    text-align: center;
-}
-
-#mediamanager__page .file div.image img {
-    width: 100%;
-}
-
-#mediamanager__page .file dl {
-}
-#mediamanager__page .file dl dt {
-    font-weight: bold;
-    display: block;
-    background-color: __background_alt__;
-}
-#mediamanager__page .file dl dd {
-    display: block;
-    background-color: __background_neu__;
-}
-
-
-/*____________ Meta data edit form ____________*/
-
-#mediamanager__page form.meta div.row {
-    margin-bottom: 5px;
-}
-
-#mediamanager__page form.meta label span {
-    display: block;
-}
-
-#mediamanager__page form.meta input {
-    width: 50%;
-}
-
-#mediamanager__page form.meta input.button {
-    width: auto;
-}
-
-#mediamanager__page form.meta textarea.edit {
-    height: 6em;
-    width: 95%;
-    min-width: 95%;
-    max-width: 95%;
-}
-
-/*____________ Revisions form ____________*/
-
-#mediamanager__page #page__revisions ul {
-    margin-left: 10px;
-    list-style-type: none;
-}
-
-#mediamanager__page #page__revisions ul li div.li div {
-    font-size: 90%;
-    color: __text_neu__;
-    padding-left: 18px;
-}
-
-#mediamanager__page #page__revisions ul li div.li input {
-    position: relative;
-    top: 1px;
-}
-
-/* File diff */
-
-#mediamanager__diff {
-}
-
-#mediamanager__diff td,
-#mediamanager__diff th {
-    width: 48%;
-    margin: 0 5px 10px 0;
-    padding: 0;
-    vertical-align: top;
-    text-align: left;
-}
-
-/* For IE7 */
-*:first-child+html #mediamanager__diff td {
-    width: 45%;
-}
-
-#mediamanager__diff th {
-    font-weight: normal;
-}
-#mediamanager__diff th a {
-    font-weight: bold;
-}
-#mediamanager__diff th span {
-    font-size: 90%;
-}
-
-#mediamanager__diff dl dd strong{
-    background-color: __highlight__;
-    color: __text__;
-    font-weight: normal;
-}
-
-/* Image diff */
-
-#mediamanager__page .file form.diffView {
-    margin-bottom: 10px;
-    display: block;
-}
-
-#mediamanager__diff div.slider {
-    margin: 10px;
-    width: 95%;
-}
-
-#mediamanager__diff .imageDiff {
-    position: relative;
-}
-#mediamanager__diff .imageDiff .image1,
-#mediamanager__diff .imageDiff .image2 {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 97%;
-}
-
-#mediamanager__diff .imageDiff.opacity .image2 {
-    -moz-opacity: 0.5;
-    -khtml-opacity: 0.5;
-    opacity: 0.5;
-}
-
-#mediamanager__diff .imageDiff.portions .image2 {
-    border-right: 1px solid red;
-    overflow: hidden;
-}
-
-#mediamanager__diff .imageDiff img {
-    width: 100%;
-}
-
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index d301869f2..7d27381c9 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -15,7 +15,7 @@ _mediaoptions.css = screen
 _admin.css        = screen
 _linkwiz.css      = screen
 _subscription.css = screen
-mediamanager.css  = screen
+_mediamanager.css  = screen
 _tabs.css         = screen
 _fileuploader.css = screen
 
-- 
cgit v1.2.3


From 4ce531577ce9aaf635a80849d5b195e5c88eef41 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 25 Sep 2011 21:07:55 +0100
Subject: media manager: file uploader improvements

---
 lib/tpl/default/_fileuploader.css | 82 +++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index 9e60393a0..458267be0 100644
--- a/lib/tpl/default/_fileuploader.css
+++ b/lib/tpl/default/_fileuploader.css
@@ -1,20 +1,26 @@
+
 .qq-uploader {
     position: relative;
     width: 100%;
 }
 
+.qq-uploader .error {
+    color: #f00;
+    background-color: #fff;
+}
+
+/* select file button */
+
 .qq-upload-button {
     display: inline-block;
     border: 1px solid __border__;
     color: __text__;
-    background-color: __background__;
+    background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
     text-decoration: none;
     font-size: 100%;
     cursor: pointer;
-    margin: 1px;
-    margin-bottom: 5px;
+    margin: 1px 1px 5px;
     padding: 0.125em 0.4em;
-    background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
 }
 
 * html .qq-upload-button,
@@ -23,9 +29,11 @@
 }
 
 .qq-upload-button-focus {
-    outline: 1px dotted black;
+    outline: 1px dotted;
 }
 
+/* drop area */
+
 .qq-upload-drop-area {
     position: absolute;
     top: 0;
@@ -35,15 +43,16 @@
     min-height: 70px;
     z-index: 2;
     background: __background_neu__;
+    color: __text__;
     text-align: center;
 }
 
 .qq-upload-drop-area span {
-    display:block;
-    position:absolute;
+    display: block;
+    position: absolute;
     top: 50%;
-    width:100%;
-    margin-top:-8px;
+    width: 100%;
+    margin-top: -8px;
     font-size: 120%;
 }
 
@@ -51,8 +60,22 @@
     background: __background_alt__;
 }
 
-.qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text {
-    margin-right: 7px;
+/* list of files to upload */
+
+.qq-uploader li {
+    margin-bottom: 5px;
+    color: __text__;
+}
+
+.qq-uploader li span,
+.qq-uploader li input,
+.qq-uploader li a {
+    margin-right: 5px;
+}
+
+.qq-upload-file {
+    display: block;
+    font-weight: bold;
 }
 
 .qq-upload-spinner {
@@ -63,44 +86,21 @@
     vertical-align: text-bottom;
 }
 
-.qq-upload-size,.qq-upload-cancel {
+.qq-upload-size,
+.qq-upload-cancel {
     font-size: 85%;
 }
 
 .qq-upload-failed-text {
-    display:none;
+    display: none;
 }
-
 .qq-upload-fail .qq-upload-failed-text {
-    display:inline;
-}
-
-.qq-upload-file {
-    display: block;
-    font-weight: bold;
-}
-
-.qq-upload-file-hidden {
-    display:none;
+    display: inline;
 }
 
-.qq-upload-cancel {
-    padding-left: 10px;
+.qq-action-container * {
+    vertical-align: middle;
 }
-
-.qq-uploader .dw__ow {
+.qq-overwrite-check input {
     margin-left: 10px;
-    margin-right: 3px;
-}
-
-.qq-uploader .check {
-    line-height: 18px;
-}
-
-.qq-uploader #mediamanager__upload_button {
-    margin-bottom: 10px;
 }
-
-.qq-uploader div.li {
-    margin-bottom: 5px;
-}
\ No newline at end of file
-- 
cgit v1.2.3


From d7a1eb30d5212b37c852debf8de6818c18bd407e Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 25 Sep 2011 22:14:51 +0100
Subject: media manager: adjusted file uploader styles in media popup to recent
 changes

---
 lib/tpl/default/_fileuploader.css | 5 +++++
 lib/tpl/default/media.css         | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index 458267be0..d06bfd519 100644
--- a/lib/tpl/default/_fileuploader.css
+++ b/lib/tpl/default/_fileuploader.css
@@ -62,6 +62,11 @@
 
 /* list of files to upload */
 
+div.qq-uploader ul {
+    margin: 0;
+    list-style: none;
+}
+
 .qq-uploader li {
     margin-bottom: 5px;
     color: __text__;
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index b325a1ef6..37369fe2f 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -145,8 +145,7 @@ it's dirty, so any "real" fixes are welcome */
     padding: 0 0.5em 0.5em 0.5em;
 }
 
-#media__content form#dw__upload,
-#media__content div#dw__flashupload {
+#media__content #mediamanager__uploader {
     display: block;
     border-bottom: solid 1px __border__;
     padding: 0 0.5em 1em 0.5em;
-- 
cgit v1.2.3


From 8032624921fc54dae6c6f44f55b8209738876113 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 27 Sep 2011 14:59:16 +0100
Subject: media manager: IE7 fixes (and other small improvements)

---
 lib/tpl/default/_mediamanager.css | 61 ++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

(limited to 'lib/tpl/default')

diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
index 03c2cb9ce..383a1597c 100644
--- a/lib/tpl/default/_mediamanager.css
+++ b/lib/tpl/default/_mediamanager.css
@@ -73,6 +73,10 @@
     color: __text__;
     line-height: 1.5em;
 }
+* html #mediamanager__page .namespaces h2,
+*+html #mediamanager__page .namespaces h2 {
+    display: inline;
+}
 
 #mediamanager__page .namespaces ul {
     margin-left: .2em;
@@ -143,6 +147,20 @@
     background-color: __background_alt__;
 }
 
+#mediamanager__page .filelist li dt a {
+    vertical-align: middle;
+    display: table-cell;
+    overflow: hidden;
+}
+* html #mediamanager__page .filelist .thumbs li dt a,
+*+html #mediamanager__page .filelist .thumbs li dt a {
+    display: block;
+}
+* html #mediamanager__page .filelist .rows li dt a,
+*+html #mediamanager__page .filelist .rows li dt a {
+    display: inline;
+}
+
 /* thumbs */
 
 #mediamanager__page .filelist .thumbs li {
@@ -160,23 +178,18 @@
     position: relative;
     line-height: 1.2;
 }
-* html #mediamanager__page .filelist .thumbs li {
-    display: inline;
-    zoom: 1;
-}
+* html #mediamanager__page .filelist .thumbs li,
 *+html #mediamanager__page .filelist .thumbs li {
     display: inline;
+    zoom: 1;
 }
 
-#mediamanager__page .filelist .thumbs li .image {
-    vertical-align: middle;
-    display: table-cell;
+#mediamanager__page .filelist .thumbs li dt a {
     width: 100px;
     height: 90px;
-    overflow: hidden;
 }
 
-#mediamanager__page .filelist .thumbs li .thumb img {
+#mediamanager__page .filelist .thumbs li dt a img {
     max-width: 90px;
     max-height: 90px;
 }
@@ -217,29 +230,21 @@
     background-color: __background_neu__;
 }
 
-#mediamanager__page .filelist .rows li .image {
-    width: 10%;
-    display: block;
-    overflow: hidden;
+#mediamanager__page .filelist .rows li dt {
     float: left;
+    width: 10%;
     height: 40px;
     text-align: center;
 }
 
-#mediamanager__page .filelist .rows li .thumb img {
-    max-width: 40px;
-    max-height: 40px;
-}
-
-#mediamanager__page .filelist .rows li .image span {
-    vertical-align: middle;
-    text-align: center;
-    display: table-cell;
+#mediamanager__page .filelist .rows li dt a {
     width: 100px;
     height: 40px;
 }
-#mediamanager__page .filelist .rows .icon {
-    margin-top: 12px;
+
+#mediamanager__page .filelist .rows li dt a img {
+    max-width: 40px;
+    max-height: 40px;
 }
 
 #mediamanager__page .filelist .rows li .name,
@@ -355,7 +360,8 @@
 
 /* File diff */
 
-#mediamanager__diff {
+#mediamanager__diff table {
+    table-layout: fixed;
 }
 
 #mediamanager__diff td,
@@ -367,11 +373,6 @@
     text-align: left;
 }
 
-/* For IE7 */
-*:first-child+html #mediamanager__diff td {
-    width: 45%;
-}
-
 #mediamanager__diff th {
     font-weight: normal;
 }
-- 
cgit v1.2.3