Merge remote branch 'upstream/master'

8 files changed, 522 insertions, 590 deletions

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index 9e60393a0..d06bfd519 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,28 +60,22 @@
     background: __background_alt__;
 }
 
-.qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text {
-    margin-right: 7px;
-}
-
-.qq-upload-spinner {
-    display: inline-block;
-    background: url("../../images/throbber.gif");
-    width: 15px;
-    height: 15px;
-    vertical-align: text-bottom;
-}
+/* list of files to upload */
 
-.qq-upload-size,.qq-upload-cancel {
-    font-size: 85%;
+div.qq-uploader ul {
+    margin: 0;
+    list-style: none;
 }
 
-.qq-upload-failed-text {
-    display:none;
+.qq-uploader li {
+    margin-bottom: 5px;
+    color: __text__;
 }
 
-.qq-upload-fail .qq-upload-failed-text {
-    display:inline;
+.qq-uploader li span,
+.qq-uploader li input,
+.qq-uploader li a {
+    margin-right: 5px;
 }
 
 .qq-upload-file {
@@ -80,27 +83,29 @@
     font-weight: bold;
 }
 
-.qq-upload-file-hidden {
-    display:none;
+.qq-upload-spinner {
+    display: inline-block;
+    background: url("../../images/throbber.gif");
+    width: 15px;
+    height: 15px;
+    vertical-align: text-bottom;
 }
 
+.qq-upload-size,
 .qq-upload-cancel {
-    padding-left: 10px;
+    font-size: 85%;
 }
 
-.qq-uploader .dw__ow {
-    margin-left: 10px;
-    margin-right: 3px;
+.qq-upload-failed-text {
+    display: none;
 }
-
-.qq-uploader .check {
-    line-height: 18px;
+.qq-upload-fail .qq-upload-failed-text {
+    display: inline;
 }
 
-.qq-uploader #mediamanager__upload_button {
-    margin-bottom: 10px;
+.qq-action-container * {
+    vertical-align: middle;
+}
+.qq-overwrite-check input {
+    margin-left: 10px;
 }
-
-.qq-uploader div.li {
-    margin-bottom: 5px;
-}
\ No newline at end of file
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
new file mode 100644
index 000000000..383a1597c
--- /dev/null
+++ b/lib/tpl/default/_mediamanager.css
@@ -0,0 +1,429 @@
+
+/*____________ 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;
+}
+* html #mediamanager__page .namespaces h2,
+*+html #mediamanager__page .namespaces h2 {
+    display: inline;
+}
+
+#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__;
+}
+
+#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 {
+    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,
+*+html #mediamanager__page .filelist .thumbs li {
+    display: inline;
+    zoom: 1;
+}
+
+#mediamanager__page .filelist .thumbs li dt a {
+    width: 100px;
+    height: 90px;
+}
+
+#mediamanager__page .filelist .thumbs li dt a 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 dt {
+    float: left;
+    width: 10%;
+    height: 40px;
+    text-align: center;
+}
+
+#mediamanager__page .filelist .rows li dt a {
+    width: 100px;
+    height: 40px;
+}
+
+#mediamanager__page .filelist .rows li dt a img {
+    max-width: 40px;
+    max-height: 40px;
+}
+
+#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 table {
+    table-layout: fixed;
+}
+
+#mediamanager__diff td,
+#mediamanager__diff th {
+    width: 48%;
+    margin: 0 5px 10px 0;
+    padding: 0;
+    vertical-align: top;
+    text-align: left;
+}
+
+#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/_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;
 }
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/images/resizecol.png b/lib/tpl/default/images/resizecol.png
index 79fea0770..f0111507c 100644
--- a/lib/tpl/default/images/resizecol.png
+++ b/lib/tpl/default/images/resizecol.png
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;
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
deleted file mode 100644
index ea69dbeb9..000000000
--- a/lib/tpl/default/mediamanager.css
+++ /dev/null
@@ -1,487 +0,0 @@
-/* Layout */
-
-#mediamanager__page {
-    width: 100%;
-    overflow-x: auto;
-}
-
-#mediamanager__page h1 {
-    margin: 0 0 .5em;
-}
-
-#mediamanager__layout {
-    min-width: 840px;
-}
-
-#mediamanager__layout .layout,
-#mediamanager__layout .layout-resizable {
-    float: left;
-}
-
-#mediamanager__layout .layout-resizable {
-    margin-right: 10px;
-    float: left;
-}
-
-#mediamanager__layout .scroll-container {
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 0;
-    margin: 0;
-    text-align: left;
-    position: relative;
-}
-
-#mediamanager__layout .background-container {
-    background-color: __background_alt__;
-    margin-bottom: 10px;
-    padding: 10px 10px 8px;
-    text-align: left;
-    min-height: 20px;
-}
-
-#mediamanager__layout .background-container .icon {
-    margin-right: 5px;
-}
-
-#mediamanager__layout_namespaces {
-    width: 15%;
-    min-width: 125px;
-}
-
-#mediamanager__layout_list {
-    width: 45%;
-    min-width: 375px;
-}
-
-#mediamanager__layout_detail {
-    width: 35%;
-    min-width: 290px;
-}
-
-#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;
-}
-
-#mediamanager__page .ui-resizable-e:hover {
-    width: 6px;
-    right: -8px;
-    background-image: none;
-    background-color: __background_alt__;
-}
-
-/* Namespaces tree */
-
-#mediamanager__page ul.idx {
-    margin-left: .2em;
-}
-
-#mediamanager__page ul.idx ul {
-    margin-left: 1em;
-}
-
-.idx .selected {
-    background-color: __highlight__;
-    font-weight: bold;
-}
-
-/* Tabs */
-
-.mediamanager-tabs a {
-    font-weight: bold;
-    display: block;
-    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-tabs .selected {
-    background-color: __background_alt__;
-}
-
-.mediamanager-tabs a:hover {
-    background-color: __background_alt__;
-    opacity: 0.5;
-}
-
-/* Title links */
-
-#mediamanager__files .namespace {
-    float: left;
-    font-weight: normal;
-}
-
-#mediamanager__tabs_list {
-    float: left;
-}
-
-#mediamanager__link_thumbs,
-#mediamanager__link_list {
-    padding-left: 30px;
-    display: inline-block;
-    width: 0;
-    overflow: hidden;
-}
-
-#mediamanager__link_thumbs {
-    background: url('../../images/icon-thumb.png') 0 -4px no-repeat;
-    margin-left: 10px;
-}
-
-#mediamanager__link_list {
-    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 {
-    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;
-}
-
-/* File list */
-
-#mediamanager__file_list {
-    padding: 0;
-    margin: 0 !important;
-}
-
-#mediamanager__file_list li:hover {
-    background-color: __background_alt__;
-}
-
-/* Files thumbs view */
-
-.mediamanager-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;
-    zoom: 1;
-    position: relative;
-    line-height: 1.2;
-}
-
-* html .mediamanager-thumbs li {
-    display: inline;
-}
-
-*+html .mediamanager-thumbs li {
-    display: inline;
-}
-
-.mediamanager-thumbs li .image,
-.mediamanager-thumbs li .image0 {
-    width: 100%;
-    height: 90px;
-    display: block;
-    overflow: hidden;
-}
-
-.mediamanager-thumbs li .image1 {
-    display: none;
-}
-
-.mediamanager-thumbs li .image span,
-.mediamanager-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 {
-    display: block;
-    overflow: hidden;
-    width: 90px;
-    white-space: nowrap;
-}
-
-.mediamanager-thumbs li .name {
-    padding: 5px 0;
-    font-weight: bold;
-}
-
-.mediamanager-thumbs li .date {
-    font-style: italic;
-    white-space: normal;
-}
-
-.mediamanager-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 {
-    display: block;
-}
-
-/* Files list view */
-
-.mediamanager-list li {
-    list-style: none;
-    display: block;
-    position: relative;
-    max-height: 50px;
-    margin: 0;
-    margin-bottom: 3px;
-    background-color: __background__;
-    color: __text__;
-}
-
-.mediamanager-list li:nth-child(2n+1) {
-    background-color: __background_neu__;
-}
-
-.mediamanager-list li .image,
-.mediamanager-list li .image1 {
-    width: 10%;
-    display: block;
-    overflow: hidden;
-    float: left;
-    height: 40px;
-    text-align: center;
-}
-
-.mediamanager-list li .image0 {
-    display: none;
-}
-
-.mediamanager-list li .name,
-.mediamanager-list li .size,
-.mediamanager-list li .filesize,
-.mediamanager-list li .date {
-    overflow: hidden;
-    float: left;
-    margin-left: 1%;
-    white-space: nowrap;
-}
-
-.mediamanager-list li .name {
-    width: 30%;
-    font-weight: bold;
-}
-
-.mediamanager-list li .size,
-.mediamanager-list li .filesize {
-    width: 15%;
-}
-
-.mediamanager-list li .date {
-    width: 20%;
-}
-
-.mediamanager-list li .date {
-    font-style: italic;
-    white-space: normal;
-}
-
-.mediamanager-list .icon {
-    max-width: 16px;
-    max-height: 16px;
-}
-
-.mediamanager-list li .image span,
-.mediamanager-list li .image1 span {
-    vertical-align: middle;
-    text-align: center;
-    display: table-cell;
-    width: 100px;
-    height: 40px;
-}
-
-.mediamanager-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 {
-    display: block;
-}
-
-/* Upload panel */
-
-#mediamanager__layout div.upload {
-    padding-bottom: 0.5em;
-}
-
-#media__content #mediamanager__uploader {
-    border-bottom: 1px solid __border__;
-    padding-bottom: 0.5em;
-}
-
-/* File preview */
-
-.mediamanager__preview,
-.mediamanager__preview_buttons {
-    text-align: center;
-    margin-bottom: 5px;
-}
-
-.mediamanager__preview img {
-    width: 99%;
-}
-
-/* Meta data edit form */
-
-#mediamanager__details div.metafield {
-    margin-bottom: 5px;
-}
-
-#mediamanager__details label {
-    display: block;
-}
-
-#mediamanager__details form.meta input {
-    width: 50%;
-}
-
-#mediamanager__details form.meta input.button {
-    width: auto;
-}
-
-#mediamanager__details form.meta textarea.edit {
-    height: 6em;
-    width: 95%;
-    min-width: 95%;
-    max-width: 95%;
-}
-
-/* Revisions form */
-
-#mediamanager__details #page__revisions ul {
-    margin-left: 10px;
-    list-style-type: none;
-}
-
-#mediamanager__details #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 {
-    position: relative;
-    top: 1px;
-}
-
-/* File diff */
-
-#mediamanager__diff {
-    margin-top: 10px;
-}
-
-#mediamanager__diff_table {
-    padding: 0;
-    margin: 0;
-    margin-top: 10px;
-}
-
-#mediamanager__diff_table li {
-    width: 48%;
-    display: inline-block;
-    margin: 0;
-    margin-bottom: 10px;
-    padding: 2px;
-    vertical-align: top;
-    zoom: 1;
-    color: __text__;
-}
-
-* html #mediamanager__diff_table li {
-    display: inline;
-}
-
-*+html #mediamanager__diff_table li {
-    display: inline;
-}
-
-/* For IE7 */
-*:first-child+html #mediamanager__diff_table li {
-    width: 45%;
-}
-
-/* Image diff */
-
-#mediamanager__layout dl.img_tags dd.highlighted{
-    background-color: __highlight__;
-}
-
-#mediamanager__form_diffview {
-    margin-bottom: 10px;
-}
-
-#mediamanager__diff_layout {
-    position: relative;
-}
-
-#mediamanager__diff_layout div {
-    position: absolute;
-    top: 0;
-    left: 0;
-}
-
-#mediamanager__diff_opacity_image1,
-#mediamanager__diff_portions_image1 {
-    width: 97%;
-}
-
-#mediamanager__diff_layout div img {
-    width: 100%;
-}
-
-#mediamanager__diff_opacity_image2 {
-    width: 97%;
-    -moz-opacity: 0.5;
-    -khtml-opacity: 0.5;
-    opacity: 0.5;
-}
-
-#mediamanager__diff_portions_image2 {
-    width: 97%;
-    border-right: 1px solid red;
-    overflow: hidden;
-}
-
-#mediamanager__opacity_slider,
-#mediamanager__portions_slider {
-    margin: 10px;
-    width: 95%;
-}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index 05914012e..7d27381c9 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -15,7 +15,8 @@ _mediaoptions.css = screen
 _admin.css        = screen
 _linkwiz.css      = screen
 _subscription.css = screen
-mediamanager.css  = screen
+_mediamanager.css  = screen
+_tabs.css         = screen
 _fileuploader.css = screen
 
 rtl.css        = rtl