commit a04908c63cef8cd41aa9db469fd88f4836b98177 parent baa35606728494f81c40de7c3affcdf59a0394f4 Author: Jan Dankert <devnull@localhost> Date: Tue, 23 Jan 2018 23:47:06 +0100 Vorarbeit für neues UI: Das HTML der Workbench wird nicht mehr über eine Action geladen, sondern ist jetzt konstant in der index.php vorhanden. Diffstat:
13 files changed, 56 insertions(+), 319 deletions(-)
diff --git a/modules/cms-ui/themes/default/layout/index.php b/modules/cms-ui/themes/default/layout/index.php @@ -46,6 +46,58 @@ <div id="workbench"> + + <?php + global $viewconfig; + $viewconfig = parse_ini_file(__DIR__.'/perspective/normal.ini.php',true); + + require_once(__DIR__.'/perspective/window.php'); + ?> + + <!-- Workbench 2 --> + <div class="container axle-x"> + + <div id="panel-tree" class="panel small resizable" id="navigationbar" data-size-factor="0.2"> + <?php + view_header('tree'); + ?> + </div> + + <div class="divider to-right"></div> + + <div class="container axle-y autosize"> + + <div class="container axle-x autosize"> + + <div id="panel-content" class="panel wide autosize"> + <?php + view_header('content'); + ?> + </div> + + <div class="divider to-left"></div> + + <div id="panel-side" class="panel small resizable" data-size-factor="0.25"> + <?php + view_header('side'); + ?> + </div> + + </div> + + + <div class="divider to-top"></div> + + <div id="panel-bottom" class="panel wide resizable" data-size-factor="0.25"> + <?php + view_header('bottom'); + ?> + </div> + + </div> + + </div> + </div> diff --git a/modules/cms-ui/themes/default/layout/perspective/administration.ini.php b/modules/cms-ui/themes/default/layout/perspective/administration.ini.php @@ -1,23 +0,0 @@ -<?php ?> - -[tree] - -views=tree:tree -default=tree - - -[content] - -views= -default=edit - - -[side] - -views=memberships -default=memberships - -[bottom] - -views=info,pw,rights,history -default=info diff --git a/modules/cms-ui/themes/default/layout/perspective/administration.php b/modules/cms-ui/themes/default/layout/perspective/administration.php @@ -1,44 +0,0 @@ - -<!-- Workbench --> -<div class="container axle-x"> - - <div id="panel-tree" class="panel small resizable" id="navigationbar" data-size-factor="0.2"> - <?php - view_header('tree'); - ?> - </div> - - <div class="divider to-right"></div> - - <div class="container axle-y autosize"> - - <div class="container axle-x autosize"> - - <div id="panel-content" class="panel wide autosize"> - <?php - view_header('content'); - ?> - </div> - - <div class="divider to-left" /> - - <div id="panel-side" class="panel small resizable" data-size-factor="0.25"> - <?php - view_header('side'); - ?> - </div> - - </div> - - - <div class="divider to-top" /> - - <div id="panel-bottom" class="panel wide resizable" data-size-factor="0.25"> - <?php - view_header('bottom'); - ?> - </div> - - </div> - -</div> diff --git a/modules/cms-ui/themes/default/layout/perspective/login.ini.php b/modules/cms-ui/themes/default/layout/perspective/login.ini.php @@ -1,14 +0,0 @@ -<?php ?> - -[tree] -views= - -[content] - -views=login:login,login:openid,login:register -default=login -modal=true - -[side] -views=login:license -default=license diff --git a/modules/cms-ui/themes/default/layout/perspective/login.php b/modules/cms-ui/themes/default/layout/perspective/login.php @@ -1,33 +0,0 @@ - -<!-- Workbench --> -<div class="container axle-x"> - - <div id="panel-tree" class="panel small resizable" id="navigationbar" data-size-factor="0.2"> - <?php - view_header('tree'); - ?> - </div> - - <div class="divider to-right"></div> - - <div class="container axle-x autosize"> - - <div id="panel-content" class="panel wide autosize"> - <?php - view_header('content'); - ?> - </div> - - <div class="divider to-left" /> - - <div id="panel-side" class="panel small resizable" data-size-factor="0.25"> - <?php - view_header('side'); - ?> - </div> - - </div> - - - -</div> diff --git a/modules/cms-ui/themes/default/layout/perspective/normal.ini.php b/modules/cms-ui/themes/default/layout/perspective/normal.ini.php @@ -11,9 +11,9 @@ default=tree [content] -views= -default= -action= +views=login:login,login:openid,login:register +default=edit +modal=true [side] diff --git a/modules/cms-ui/themes/default/layout/perspective/normal.php b/modules/cms-ui/themes/default/layout/perspective/normal.php @@ -1,44 +0,0 @@ - -<!-- Workbench --> -<div class="container axle-x"> - - <div id="panel-tree" class="panel small resizable" id="navigationbar" data-size-factor="0.2"> - <?php - view_header('tree'); - ?> - </div> - - <div class="divider to-right"></div> - - <div class="container axle-y autosize"> - - <div class="container axle-x autosize"> - - <div id="panel-content" class="panel wide autosize"> - <?php - view_header('content'); - ?> - </div> - - <div class="divider to-left" /> - - <div id="panel-side" class="panel small resizable" data-size-factor="0.25"> - <?php - view_header('side'); - ?> - </div> - - </div> - - - <div class="divider to-top" /> - - <div id="panel-bottom" class="panel wide resizable" data-size-factor="0.25"> - <?php - view_header('bottom'); - ?> - </div> - - </div> - -</div> diff --git a/modules/cms-ui/themes/default/layout/perspective/profile.ini.php b/modules/cms-ui/themes/default/layout/perspective/profile.ini.php @@ -1,20 +0,0 @@ -<?php ?> - - -[tree] -views =start:usertimeline -default = usertimeline - -[content] - -views = profile:edit,profile:pw -default = edit -modal = false - -[side] -views = -default = - -[bottom] -views = profile:memberships -default = memberships diff --git a/modules/cms-ui/themes/default/layout/perspective/profile.php b/modules/cms-ui/themes/default/layout/perspective/profile.php @@ -1,32 +0,0 @@ - -<!-- Workbench --> -<div class="container axle-x"> - - <div id="panel-tree" class="panel small resizable" id="navigationbar" data-size-factor="0.4"> - <?php - view_header('tree'); - ?> - </div> - - <div class="divider to-right"></div> - - <div class="container axle-y autosize"> - - - <div id="panel-content" class="panel wide autosize"> - <?php - view_header('content'); - ?> - </div> - - <div class="divider to-top" /> - - <div id="panel-bottom" class="panel wide resizable" data-size-factor="0.3"> - <?php - view_header('bottom'); - ?> - </div> - - </div> - -</div> diff --git a/modules/cms-ui/themes/default/layout/perspective/start.ini.php b/modules/cms-ui/themes/default/layout/perspective/start.ini.php @@ -1,17 +0,0 @@ -<?php ?> - -[tree] -views=start:projectmenu -default=projectmenu - -[content] - -views=start:timeline,start:usertimeline -default=timeline - -[side] -views=start:applications -default=applications - -[bottom] -views= diff --git a/modules/cms-ui/themes/default/layout/perspective/start.php b/modules/cms-ui/themes/default/layout/perspective/start.php @@ -1,44 +0,0 @@ - -<!-- Workbench --> -<div class="container axle-x"> - - <div id="panel-tree" class="panel small resizable" id="navigationbar" data-size-factor="0.35"> - <?php - view_header('tree'); - ?> - </div> - - <div class="divider to-right"></div> - - <div class="container axle-y autosize"> - - <div class="container axle-x autosize"> - - <div id="panel-content" class="panel wide autosize"> - <?php - view_header('content'); - ?> - </div> - - <div class="divider to-left" /> - - <div id="panel-side" class="panel small resizable" data-size-factor="0.25"> - <?php - view_header('side'); - ?> - </div> - - </div> - - - <div class="divider to-top" /> - - <div id="panel-bottom" class="panel wide resizable" data-size-factor="0.25"> - <?php - view_header('bottom'); - ?> - </div> - - </div> - -</div> diff --git a/modules/cms-ui/themes/default/layout/perspective/window.php b/modules/cms-ui/themes/default/layout/perspective/window.php @@ -63,7 +63,7 @@ function view_header( $name ) <div class="panel-icon"> <?php if (!empty($viewlist) || $name=='content') { /* Fenster-Menü anzeigen (sofern Views vorhanden) */ ?> -<div class="arrow-down" /> +<div class="arrow-down"></div> <div class="dropdown dropdownalignright"> <div class="entry clickable"><a href="javascript:void(0);" class="fullscreen" data-type="fullscreen"><img src="<?php echo OR_THEMES_DIR.'default/images/icon/window/maximize.gif' ?>" title="<?php echo langHtml('window_fullscreen') ?>" /><?php echo langHtml('window_fullscreen') ?></a></div> <?php diff --git a/modules/cms-ui/themes/default/layout/perspective/workbench.php b/modules/cms-ui/themes/default/layout/perspective/workbench.php @@ -1,44 +0,0 @@ - -<!-- Workbench --> -<div class="container axle-x"> - - <div id="panel-tree" class="panel small resizable" id="navigationbar" data-size-factor="0.2"> - <?php - view_header('tree'); - ?> - </div> - - <div class="divider to-right"></div> - - <div class="container axle-y autosize"> - - <div class="container axle-x autosize"> - - <div id="panel-content" class="panel wide autosize"> - <?php - view_header('content'); - ?> - </div> - - <div class="divider to-left" /> - - <div id="panel-side" class="panel small resizable" data-size-factor="0.25"> - <?php - view_header('side'); - ?> - </div> - - </div> - - - <div class="divider to-top" /> - - <div id="panel-bottom" class="panel wide resizable" data-size-factor="0.25"> - <?php - view_header('bottom'); - ?> - </div> - - </div> - -</div>