commit da48f662e8a4936d4ec60bf0b2b31e80b7f7c276
parent 1f3109a824e94a347d1d5506ad0fe1758d951f92
Author: Jan Dankert <devnull@localhost>
Date: Tue, 23 Oct 2012 00:11:50 +0200
CSS-Fix für Baummenü.
Diffstat:
3 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php
@@ -862,11 +862,13 @@ ul.views > li > div
float:left;
}
-div.views div.icons
+div.views div.icons,
+div.inputholder > div.icon
{
float: right;
}
+
div.window div.menu ul.views
{
float:left;
@@ -990,18 +992,11 @@ table > tr.data:nth-child(2n) {
/* Datenzeile - Mauseffekt */
table tr.data:hover,
-div#tree div.content li div.entry:hover
+div.content li div.entry:hover
{
background-color:<?php echo $_GET['inactive_background_color']; ?>;;
}
-/* Datenzeile mit URL - Mauseffekt */
-table tr.data td[onclick]:hover{
- background-color:<?php echo $_GET['inactive_background_color']; ?>;
-}
-
-tr.data > td[onclick],
-div.dropdown div[onclick],
ul.tree div
{
cursor:pointer;
@@ -1468,6 +1463,19 @@ div.inputholder
}
+
+div.inputholder ul.tree,
+div.inputholder ul.tree li.last,
+div.inputholder ul.tree li:last-child
+{
+ background-color:<?php echo $_GET['title_text_color']; ?>;
+}
+
+div.inputholder > div.dropdown
+{
+ width:70%;
+}
+
div.search > div.inputholder
{
padding-top:1px;
diff --git a/themes/default/include/html/selector.inc.php b/themes/default/include/html/selector.inc.php
@@ -2,8 +2,7 @@
<input type="hidden" name="targetid" value="<?php echo $attr_id ?>" />
<div class="name"><?php echo $attr_name ?></div>
-
-<img class="icon" src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/menu.gif' ?>" />
+<div class="icon"><img class="icon" src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/menu.gif' ?>" /></div>
<div class="dropdown">
<div class="tree selector" data-types="<?php echo $attr_types ?>" data-init-id="<?php echo $attr_id ?>" data-init-folderid="<?php echo $attr_folderid ?>"></div>
</div>
diff --git a/themes/default/templates/folder/edit.tpl.src.xml b/themes/default/templates/folder/edit.tpl.src.xml
@@ -49,7 +49,7 @@
<column>
<text raw="_" />
</column>
- <column colspan="2" class="clickable">>
+ <column colspan="2" class="clickable">
<link type="view" action="folder" subaction="createfolder">
<image file="icon/create"></image>
<text key="menu_folder_createfolder"></text>
@@ -71,7 +71,7 @@
<column>
<text raw="_" />
</column>
- <column colspan="2" class="clickable">>
+ <column colspan="2" class="clickable">
<link type="view" action="folder" subaction="createfile">
<image file="icon/create"></image>
<text key="menu_folder_createfile"></text>
@@ -82,7 +82,7 @@
<column>
<text raw="_" />
</column>
- <column colspan="2" class="clickable">>
+ <column colspan="2" class="clickable">
<link type="view" action="folder" subaction="createlink">
<image file="icon/create"></image>
<text key="menu_folder_createlink"></text>
@@ -112,14 +112,27 @@
<group title="message:options">
<set var="type" value="var:defaulttype"></set>
<list list="actionlist" value="actiontype">
- <radio name="type" value="var:actiontype"></radio>
- <label for="type" value="var:actiontype">
- <text raw="_"></text>
- <text key="var:actiontype" prefix="FOLDER_SELECT_"></text>
- </label>
- <newline></newline>
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <radio name="type" value="var:actiontype"></radio>
+ <label for="type" value="var:actiontype">
+ <text raw="_"></text>
+ <text key="var:actiontype" prefix="FOLDER_SELECT_"></text>
+ </label>
+ </part>
+ </part>
</list>
- <selector types="folder,link" name="var:rootfoldername" id="var:rootfolderid" folderid="var:rootfolderid" />
+ <part class="line">
+ <part class="label">
+ <text key="FOLDER_SELECT_TARGET_FOLDER" />
+ </part>
+ <part class="input">
+ <selector types="folder,link" name="var:rootfoldername"
+ id="var:rootfolderid" folderid="var:rootfolderid" />
+ </part>
+ </part>
</group>
</column>
</row>
