commit 6e2e987de7ec19e56f66da149c81280880a7264c
parent 89c2413541c2d475b2ac08f2ff2ecc398b4ee320
Author: Jan Dankert <devnull@localhost>
Date: Thu, 7 Jun 2012 23:48:53 +0200
Neu: Tabs sind jetzt schließbar.
Diffstat:
5 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/themes/default/css/layout.css b/themes/default/css/layout.css
@@ -845,6 +845,9 @@ div.window div.menu
div.window div.menu ul.views { /* general settings */
text-align: left; /* set to left, right or center */
list-style-type: none;
+overflow-x: auto;
+overflow-y: none;
+white-space:nowrap;
}
div.window ul.views li
@@ -1472,9 +1475,10 @@ div.window.fullscreen
body > div#header {
display:block;
}
+
ul#history > li {
- display:inline;
+ xdisplay:inline;
margin:5px;
padding:5px;
border:1px solid gray;
@@ -1483,7 +1487,7 @@ ul#history > li {
}
ul#history > li.active {
- display:inline;
+ xdisplay:inline;
margin:5px;
padding:5px;
border:1px solid black;
@@ -1491,6 +1495,11 @@ ul#history > li.active {
color:black;
}
+ul#history {
+ display:none;
+}
+
+
table td.readonly {
font-style: italic;
font-weight: normal;
diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js
@@ -516,20 +516,38 @@ function openNewAction( name,action,id,extraId )
} );
}
-
- // Neuen Tab in Hauptfenster anlegen
+ // Andere Tabs auf inaktiv setzen
$('div#content > div.window > div.menu > div.views > ul.views li.active').removeClass('active');
- $('div#content > div.window > div.menu > div.views > ul.views').append('<li class="action active '+action+' id'+id+'"><span><img src="'+OR_THEMES_EXT_DIR+'default/images/icon_'+action+'.png" title="" />'+name+'</span></li>');
- $('div#content > div.window > div.menu > div.views > ul.views li.active').click( function()
- {
- // Action-Tab wurde angeklickt
- $('div#content > div.window > div.menu > div.views > ul.views li.active').removeClass('active'); // Andere Tabs auf inaktiv setzen
- $(this).addClass('active'); // Angeklicktes Tab auf aktiv setzen
-
- setNewAction(action,id,extraId);
- } );
-
+
+ // Tab schon vorhanden?
+ if ( $('div#content > div.window > div.menu > div.views > ul.views li.'+action+'.id'+id).length > 0 )
+ {
+ // Ja, Tab schon vorhanden
+ // Gewünschtes Tab aktiv setzen
+ $('div#content > div.window > div.menu > div.views > ul.views li.'+action+'.id'+id).addClass('active');
+ }
+ else
+ {
+ // Neuen Tab in Hauptfenster anlegen
+ $('div#content > div.window > div.menu > div.views > ul.views li.active').removeClass('active');
+ $('div#content > div.window > div.menu > div.views > ul.views').append('<li class="action active '+action+' id'+id+'" data-method="edit"><span><img src="'+OR_THEMES_EXT_DIR+'default/images/icon_'+action+'.png" title="" />'+name+'<img class="close" src="'+OR_THEMES_EXT_DIR+'default/images/icon_close.png" title="" /></span></li>');
+ $('div#content > div.window > div.menu > div.views > ul.views').scrollLeft(9999);
+ $('div#content > div.window > div.menu > div.views > ul.views img.close').click( function()
+ {
+ // Schließen
+ $(this).parent().parent().parent().parent().parent().parent().find('div.content > div.filler').html(''); // Inhalt entfernen
+ $(this).parent().parent().remove(); // Tab entfernen
+ } );
+ $('div#content > div.window > div.menu > div.views > ul.views li.active').click( function()
+ {
+ // Action-Tab wurde angeklickt
+ $('div#content > div.window > div.menu > div.views > ul.views li.active').removeClass('active'); // Andere Tabs auf inaktiv setzen
+ $(this).addClass('active'); // Angeklicktes Tab auf aktiv setzen
+
+ setNewAction(action,id,extraId);
+ } );
+ }
setNewAction( action,id,extraId );
}
diff --git a/themes/default/layout/perspective/administration.ini.php b/themes/default/layout/perspective/administration.ini.php
@@ -11,15 +11,22 @@ refreshable=false
[content]
-views=edit,pw,rights
-action=projectlist
+views=
+action=
refreshable=true
default=edit
[member]
-views=memberships,info
+views=memberships,edit
action=project
refreshable=true
default=memberships
+
+[extra]
+
+views=info,pw,rights
+action=project
+refreshable=true
+default=info
diff --git a/themes/default/layout/perspective/administration.php b/themes/default/layout/perspective/administration.php
@@ -17,7 +17,7 @@ view_header('content');
<div class="grid_3">
<?php
view_header('member');
-//view_header('extra');
+view_header('extra');
?>
</div>
diff --git a/themes/default/layout/perspective/normal.ini.php b/themes/default/layout/perspective/normal.ini.php
@@ -13,15 +13,15 @@ refreshable=false
title=
default=show
-views=show,edit,prop,rights
-action=folder
+views=
+action=
refreshable=true
[extra]
title=
default=pub
-views=pub
+views=pub,show,edit,prop,rights
action=folder
refreshable=true
