commit 9fa99a6eedaec48d4fe3477acbe88f01e34647e0
parent 1e936ad433d6a999e2924b3c9d758a27c42f7b03
Author: Jan Dankert <devnull@localhost>
Date: Thu, 9 Aug 2012 21:16:30 +0200
Kein Gridlayout mehr.
Diffstat:
10 files changed, 114 insertions(+), 41 deletions(-)
diff --git a/themes/default/layout/perspective/administration.ini.php b/themes/default/layout/perspective/administration.ini.php
@@ -1,5 +1,6 @@
<?php ?>
+icons=projectlist,userlist,grouplist,configuration
[tree]
@@ -17,14 +18,14 @@ refreshable=true
default=edit
-[member]
+[side]
-views=memberships,edit
+views=memberships,info
action=project
refreshable=true
default=memberships
-[extra]
+[bottom]
views=info,pw,rights
action=project
diff --git a/themes/default/layout/perspective/administration.php b/themes/default/layout/perspective/administration.php
@@ -1,24 +1,21 @@
-
-<div class="container_12">
-
-<div class="grid_3">
+<div class="bar" id="navigationbar">
<?php
view_header('tree');
?>
</div>
-<div class="grid_6">
+<div class="bar" id="contentbar">
<?php
view_header('content');
-//view_header('extra');
?>
</div>
-<div class="grid_3">
+<div class="bar" id="sidebar">
<?php
view_header('member');
+?>
+<?php
view_header('extra');
?>
</div>
-</div>
-\ No newline at end of file
diff --git a/themes/default/layout/perspective/login.ini.php b/themes/default/layout/perspective/login.ini.php
@@ -1,8 +1,21 @@
<?php ?>
+[tree]
+views=
+
[content]
-views=login,openid,register,license
+views=login,openid,register
+action=login
+refreshable=false
+default=login
+
+[side]
+views=license
action=login
refreshable=false
-default=login
-\ No newline at end of file
+default=license
+
+
+[bottom]
+views=
diff --git a/themes/default/layout/perspective/login.php b/themes/default/layout/perspective/login.php
@@ -1,10 +1,15 @@
-<div class="container_12">
-<div class="prefix_4 grid_4 suffix_4">
+<div class="bar" id="navigationbar">
+ <div class="frame"> </div>
+</div>
+
+<div class="bar" id="contentbar">
<?php
view_header('content');
?>
</div>
-</div>
+<div class="bar" id="sidebar">
+ <div class="frame"> </div>
+</div>
+\ No newline at end of file
diff --git a/themes/default/layout/perspective/normal.ini.php b/themes/default/layout/perspective/normal.ini.php
@@ -1,4 +1,6 @@
+icons=templatelist,languagelist
+
[tree]
@@ -17,17 +19,18 @@ views=
action=
refreshable=true
-[extra]
+[side]
title=
-default=pub
-views=pub,show,edit,prop,rights
+default=prop
+views=prop,pub
action=folder
refreshable=true
-[extra2]
+[bottom]
title=
default=structure
-views=structure,info
+views=structure,info,archive,rights
refreshable=true
+
diff --git a/themes/default/layout/perspective/normal.php b/themes/default/layout/perspective/normal.php
@@ -1,25 +1,39 @@
-<div class="container_12">
+<div id="shortcuts">
+<?php
+$icons = @$viewconfig['icons'];
+if (!empty($icons))
+{
+ foreach( explode(',',$icons) as $name )
+ {
+ echo "<div class=\"shortcut\" title=\"".lang('ACTION_'.$name)."\" onClick=\"javascript:openNewAction('".lang('ACTION_'.$name)."','$name','','');\"><img src=\"".OR_THEMES_EXT_DIR.'/default/images/icon_'.$name.'.png'."\" /></div>";
+ }
+}
+?>
+
+</div>
-<div class="grid_3">
+<div class="bar" id="navigationbar">
<?php
view_header('tree');
?>
</div>
-<div class="grid_6">
+<div class="bar" id="contentbar">
<?php
view_header('content');
?>
</div>
-<div class="grid_3">
+<div class="bar" id="sidebar">
<?php
-view_header('extra');
+view_header('side');
?>
+</div>
+
+<div class="bar" id="bottombar">
<?php
-view_header('extra2');
+view_header('bottom');
?>
</div>
-</div>
-\ No newline at end of file
diff --git a/themes/default/layout/perspective/profile.ini.php b/themes/default/layout/perspective/profile.ini.php
@@ -1,8 +1,25 @@
<?php ?>
+
+[tree]
+views=
+
[content]
-views = edit,settings,pw,memberships
+views = edit,pw,memberships
action = profile
refreshable = false
default = edit
+
+
+[side]
+views = settings
+action = profile
+refreshable = false
+default = settings
+
+[bottom]
+views = memberships
+default = memberships
+action = profile
+refreshable = false
diff --git a/themes/default/layout/perspective/profile.php b/themes/default/layout/perspective/profile.php
@@ -1,10 +1,15 @@
-<div class="container_12">
-<div class="prefix_3 grid_6 suffix_3">
+<div class="bar" id="navigationbar">
+ <div class="frame"> </div>
+</div>
+
+<div class="bar" id="contentbar">
<?php
view_header('content');
?>
</div>
-</div>
+<div class="bar" id="sidebar">
+ <div class="frame"> </div>
+</div>
+\ No newline at end of file
diff --git a/themes/default/layout/perspective/start.ini.php b/themes/default/layout/perspective/start.ini.php
@@ -1,8 +1,22 @@
<?php ?>
+[tree]
+views=
+
[content]
-views=applications,projectmenu
+views=projectmenu
action=start
refreshable=false
-default=projectmenu
-\ No newline at end of file
+default=projectmenu
+
+
+[side]
+views=applications
+action=start
+refreshable=false
+default=applications
+
+
+[bottom]
+views=
diff --git a/themes/default/layout/perspective/start.php b/themes/default/layout/perspective/start.php
@@ -1,10 +1,15 @@
-<div class="container_12">
-<div class="prefix_4 grid_4 suffix_4">
+<div class="bar" id="navigationbar">
+ <div class="frame"> </div>
+</div>
+
+<div class="bar" id="contentbar">
<?php
view_header('content');
?>
</div>
-</div>
+<div class="bar" id="sidebar">
+ <div class="frame"> </div>
+</div>
+\ No newline at end of file
