From 3df72098bbc205fa4bd4735d52d2626baad93548 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 19 May 2006 18:50:23 +0200 Subject: new mediamanager This patch adds a completely rewritten media popup. The following noteworthy changes were made: - media manager uses a collapsible namespace tree - media manager uses AJAX if available - media manager popup can be kept open when selecting a media file - only one template is used for the media manager :!: Template - Editable image metadata is configured in conf/mediameta.php now - The JS cookie mechanism was enhanced to store key/value pairs - Language strings can be exported to JS in js.php darcs-hash:20060519165023-7ad00-4932b4553fc919aa4a8b8187958b823acf4f8cee.gz --- lib/tpl/default/media.css | 115 +++++++++++++++++++++++++++++++++++++++ lib/tpl/default/media.php | 54 ------------------ lib/tpl/default/mediaedit.php | 87 ----------------------------- lib/tpl/default/mediamanager.php | 41 ++++++++++++++ lib/tpl/default/mediaref.php | 50 ----------------- lib/tpl/default/style.ini | 3 + 6 files changed, 159 insertions(+), 191 deletions(-) create mode 100644 lib/tpl/default/media.css delete mode 100644 lib/tpl/default/media.php delete mode 100644 lib/tpl/default/mediaedit.php create mode 100644 lib/tpl/default/mediamanager.php delete mode 100644 lib/tpl/default/mediaref.php (limited to 'lib/tpl') diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css new file mode 100644 index 000000000..96aac41ce --- /dev/null +++ b/lib/tpl/default/media.css @@ -0,0 +1,115 @@ +/** + * The CSS in here cotrols the appearance of the media manager + */ + +#media__left { + width: 30%; + float: left; + border-right: solid 1px __dark__; +} + +#media__right { + width: 68%; + float: left; + border-left: solid 1px __dark__; + margin-left: -1px; +} + +#media__tree img { + float:left; + padding: 0.5em 0.3em 0 0; +} + +#media__tree ul { + list-style-type: none; + list-style-image: none; +} + +#media__tree li { + clear: left; + list-style-type: none; + list-style-image: none; +} + +/* --- file list --- */ + +#media__content img.load { + margin: 1em auto; +} + +#media__content #scroll__here { + border: 1px dashed __dark__; +} + +#media__content .odd { + background-color: __lighter__; + padding: 0.4em; +} + +#media__content .even { + padding: 0.4em; +} + +#media__content a.mediafile { + margin-right: 1.5em; + font-weight: bold; +} + +#media__content div.detail { + padding: 0.3em 0 0.3em 2em; +} + +#media__content div.detail div.thumb { + float: left; + width: 130px; + text-align: center; + margin-right: 0.4em; +} + + +#media__content img.btn { + vertical-align: text-bottom; +} + +/* --- upload form --- */ + +#media__content form.upload { + display: block; + border-bottom: solid 1px __dark__; + padding: 0 0 1em 2em; +} + +/* --- meta edit form --- */ + +#media__content form.meta { + display: block; + padding: 0 0 1em 0; +} + +#media__content form.meta label { + display: block; + width: 20%; + float: left; + text-align: right; + font-weight: bold; + padding-right: 1em; +} + +#media__content form.meta .edit { + float: left; + width: 75%; +} + +#media__content form.meta textarea.edit { + height: 6em; +} + +#media__content form.meta div.metafield { + clear: left; +} + +#media__content form.meta div.buttons { + clear: left; + margin-left: 20%; + padding-left: 1em; +} diff --git a/lib/tpl/default/media.php b/lib/tpl/default/media.php deleted file mode 100644 index c2c632e46..000000000 --- a/lib/tpl/default/media.php +++ /dev/null @@ -1,54 +0,0 @@ - - - */ -?> - - - - <?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>] - - - - - - - - -
- - -

- -
- -
- - - -
- -
- - -
- -
-
- -
- -
- - - diff --git a/lib/tpl/default/mediaedit.php b/lib/tpl/default/mediaedit.php deleted file mode 100644 index 79175e009..000000000 --- a/lib/tpl/default/mediaedit.php +++ /dev/null @@ -1,87 +0,0 @@ - - - */ -?> - - - - <?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>] - - - - - - - -
- - -

- -
- - -
-
- - - - -
- - -
- - -
- - -
- - - -
- - - - -
-
- - - -
- -
- - diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php new file mode 100644 index 000000000..10b31ba63 --- /dev/null +++ b/lib/tpl/default/mediamanager.php @@ -0,0 +1,41 @@ + + + */ +?> + + + + <?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>] + + + + + +
+ +
+

+ + + + +
+
+ +
+ +
+
+ + diff --git a/lib/tpl/default/mediaref.php b/lib/tpl/default/mediaref.php deleted file mode 100644 index 06af5764c..000000000 --- a/lib/tpl/default/mediaref.php +++ /dev/null @@ -1,50 +0,0 @@ - - - */ -?> - - - - <?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>] - - - - - - - - -
- - -

- -
-
-

-
- - - - -
- -
- - - diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index e6452ad90..bb4cd2305 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -9,6 +9,9 @@ layout.css = screen design.css = screen style.css = screen + +media.css = screen + rtl.css = rtl print.css = print -- cgit v1.2.3