fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [14495] more on new portico-layout


From: Sigurd Nes
Subject: [Fmsystem-commits] [14495] more on new portico-layout
Date: Fri, 27 Nov 2015 15:31:48 +0000

Revision: 14495
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14495
Author:   sigurdne
Date:     2015-11-27 15:31:47 +0000 (Fri, 27 Nov 2015)
Log Message:
-----------
more on new portico-layout

Modified Paths:
--------------
    branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
    branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
    branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
    branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
    branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
    branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
    branches/dev-syncromind/property/setup/phpgw_no.lang

Modified: branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/css/base.css     
2015-11-27 11:09:35 UTC (rev 14494)
+++ branches/dev-syncromind/phpgwapi/templates/portico/css/base.css     
2015-11-27 15:31:47 UTC (rev 14495)
@@ -1,513 +1,534 @@
-/*
-       Border-layout for CSS only layout
-*/
+/* Global Styles */
 
-
-/*
-       Border-layout common for CSS and JS layout
-*/
-
-div.layout-north div.body,
-div.layout-south div.body
-{
-       position: relative;
-       float: left;
-       width: 100%;
-       background: #000;
-       color: #fff;
-       line-height: 26px;
+BODY {
+       font-family: Lucida Grande, Lucida Sans, Arial, Helvetica, sans-serif;
+       font-size: 100%;
+       color: #000;
+       background-color: #677;
+       margin: 0;
+       padding: 0;
 }
 
-div.layout-north div.body h2
-{
-       font-size: 1em;
-       font-weight: bold;
-       margin: 0 5px;
-}
+A {
+       color: #00D;
+       text-decoration: none;
+       }
+       A:visited {
+               color: #60C;
+       }
+       A:hover {
+               color: #00F;
+               text-decoration: underline;
+       }
+       A:visited:hover {
+               color: #80E;
+       }
 
-div.layout-north div.body div.button-bar
-{
-       position: absolute;
-       right: 0px;
-       top: 0px;
-       line-height: 26px;
+/* bookmarks - depricated? */
+A.bm ,
+A.bm:visited
+A.bm:hover {
+       color: #000;
+       text-decoration: none;
+       font-size: inherit;
 }
 
-div.layout-north div.body div.button-bar a
-{
-       color: #fff;
-       text-decoration: none;
-       margin: 0 5px;
-       display: block;
-       float: left;
+TD {
+       vertical-align: top;
 }
 
-div.layout-south div.body div.button-bar
-{
-       float: right;
-       margin: 0 5px;
+P {
+       line-height: 1.5em;
+       margin: 0.75em 0 0.5em;
 }
 
+H1 {
+       color: #C30;
+/*     font: 1.65em Georgia, "Times New Roman", Times, serif;*/
+       font-weight: normal;
+       letter-spacing: 0.1em;
+       margin: 0 0 0.75em;
+       }
+       H1 A , /* bookmarks - depricated? */
+       H1 A:visited ,
+       H1 A:hover {
+               color: #C30 !important;
+       }
 
-/*
-       Reset headings which get reset by YUI! - based on firefox 2 html.css
-*/
+H2 {
+/*     font: 1.3em Georgia, "Times New Roman", Times, serif;*/
+       font-weight: bold;
+       text-transform: uppercase;
+       letter-spacing: 0.1em;
+       color: #566F6F;
+       border-bottom:  1px dotted #566F6F;
+       padding: 1em 0 3px;
+       margin: 0.5em 0 0.75em;
+       }
+       H2 A , /* bookmarks - depricated? */
+       H2 A:visited ,
+       H2 A:hover {
+               color: #566F6F !important;
+       }
 
-h1
-{
-  font-size: 2em;
-  font-weight: bold;
-  margin: .67em 0;
+H3 {
+       font-size: 1.2em;
+       font-weight: bold;
+       font-style: italic;
+       padding-top: 1em;
+       margin: 0.5em 0 0.75em;
 }
 
-h2
-{
-  font-size: 1.5em;
-  font-weight: bold;
-  margin: .83em 0;
+H4 {
+       font-size: 1.1em;
+       font-weight: bold;
+       padding-top: 0.5em;
+       margin: 0.5em 0 1em;
 }
 
-h3
-{
-  font-size: 1.17em;
-  font-weight: bold;
-  margin: 1em 0;
+BLOCKQUOTE {
+       margin: 1em 0 1em 3em;
 }
-
-h4
-{
-  font-weight: bold;
-  margin: 1.33em 0;
-}
-
-strong
-{
+TT { /* used for inline code references */
+       font-size: 1.1em;
        font-weight: bold;
 }
-
-/*
-       Error Related CSS
-*/
-.error
-{
-       background-color: #fcc;
-       border: 1px solid #f00;
-       color: #f00;
+PRE { /* used for code blocks */
+       font-size: 1.1em;
+       font-weight: normal;
+       margin: 1em 0;
+       padding: 5px 7px 7px;
+       border: 1px solid #CCC;
+       background-color: #F6F6F6;
 }
-
-.msg
-{
-       background-color: #FFA500;
-       border: 1px solid #f00;
-       color: #f00;
-       text-align: center;
+PRE I { /* code comment */
+       color: #666;
+       font-style: italic;
 }
 
-.msg_good
-{
-       background-color:  #99FF66;
-       border: 1px solid #00CC00;
+STRONG {
        font-weight: bold;
-       text-align: center;
+       color: #B30;
 }
 
-.warn
-{
-       background-color: #ff8;
-       border: 1px solid #fc0;
-       color: #fc0;
-}
+UL, OL {
+       margin-top: 0.5ex;
+       margin-bottom: 1ex;
+       margin-left: 2em;
+       padding: 0;
+       }
+       LI {
+               line-height: 1.35em;
+               padding: 0.75ex 0;
+               margin: 0;
+       }
 
-div.error, div.warn
-{
+/* ID Styles */
+
+#logo {
+/*     font: 2em Georgia, "Times New Roman", Times, serif;*/
+       color: #FFF;
+       letter-spacing: 1px;
        font-weight: bold;
-       padding: 2px;
-       text-align: center;
+       padding: 0.5em 15px 2px;
 }
 
-/*
-       Table styling
-*/
+#navigation {
+       padding: 5px 5px 7px 3em;
+       background-color: #A4C2C2;
+       border-top: 1px solid #FFF;
+       border-bottom: 1px solid #FFF;
+       text-align:             right;
+       }
+       #navigation A {
+               color: #255;
+               font-size: 0.85em;
+               font-weight: bold;
+               text-decoration: none;
+               letter-spacing: 1px;
+               margin-right: 1em;
+               }
+               #navigation A:hover {
+                       color: #033;
+                       text-decoration: none;
+               }
+               #navigation A.current ,
+               #navigation A.current:hover {
+                       color: #C30;
+               }
 
-.row_on
-{
-       background-color: #eee;
-}
+#nav2 {
+       padding: 5px 5px 7px 3em;
+       background-color: #a4c2c2;
+       border-bottom: 1px solid #fff;
+       }
+       #nav2 A {
+               color: #04E;
+               font-size: 0.85em;
+               font-weight: bold;
+               text-decoration: none;
+               letter-spacing: 1px;
+               margin-right: 1em;
+               }
+               #nav2 A:hover {
+                       color: #00E;
+                       text-decoration: none;
+               }
+               #nav2 A.current ,
+               #nav2 A.current:hover {
+                       color: #C30;
+               }
 
-.row_off
-{
-       background-color: #e9e9e9;
+#iframeInstructions {
+       font-size: 1.1em;
+       background: #eee;
+       padding: 4px 2em 6px;
 }
-
-.row_on, .row_off
-{
-       padding: 3px;
+IFRAME {
+       border-top: 1px solid #777;
+       background-color: #FFF;
 }
 
-.row_on:hover, .row_off:hover
-{
+TR.main {
        background-color: #fff;
-}
+       }
 
-thead, th, .th
-{
-       background: #ddd url(../images/ofm-gard-top.png) top left repeat-x;
-}
-/*
-       Menu layout ("navbar" conflicts with the template "simple" - testing - 
try the admin section)
-*/
+       TD.content {
+               padding: 1em 2em 3em;
+       }
 
-.yui-skin-sam .yui-navset .yui-nav li.disabled
-{
-       opacity: .5;
-}
+       TD.sidebarLeft {
+               background-color: #a4c2c2;
+               }
+               TD.sidebarLeft P {
+               /*      font: 1em Georgia, "Times New Roman", Times, serif;*/
+                       color: #366;
+                       line-height: 1.5em;
+                       padding: 20px;
+                       margin: 0;
+               }
 
-.yui-skin-sam .yui-navset .yui-nav li.disabled a, .yui-skin-sam .yui-navset 
.yui-nav li.disabled a:hover
-{
-       background:#D8D8D8 url(sprite.png) repeat-x scroll 0% 50%;
-       cursor: default;
-}
+       TD.sidebarRight {
+               padding: 1em;
+               padding-left: 0;
+               }
+               DIV.bookmarks {
+                       background-color: #a4c2c2;
+                       padding: 0.5em;
+                       }
+                       .bookmarks UL {
+                               margin-top: 0;
+                               margin-bottom: 0.5em;
+                               margin-left: 2em;
+                               list-style-type: square;
+                               /*
+                               list-style: none;
+                               margin: 0;
+                               padding: 0;
+                               */
+                               }
+                               .bookmarks LI {
+                                       font-size: 0.9em;
+                                       text-transform: uppercase;
+                                       padding-top: 0.25em;
+                                       padding-bottom: 0.25em;
+                                       }
 
-.home_portal_controls
-{
-       float: right;
-       text-align: right;
-       padding: 5px 5px 0px 0px;
-       width: 10px;
-}
+/* Generic Classes */
 
+.bold          { font-weight: bold; }
+.notBold       { font-weight: normal; }
+.italic                { font-style: italic; }
+.notItalic     { font-style: normal; }
+
+.noMargin              { margin: 0; }
+.noTopMargin   { margin-top: 0; }
+.noBottomMargin        { margin-bottom: 0; }
+
+.noPadding     { padding: 0; }
+
+.white         { color: #FFF; }
+.grey          { color: #777; }
+.red           { color: #F00; }
+
+
 /*
-*      STYLES FOR: complex.html
+*      STYLES FOR: documentation and tips pages
 *
 *      Created with ThemeRoller...
 *      
http://ui.jquery.com/themeroller/?bgColorDefault=e0e0e0&bgTextureDefault=02_glass.png&bgImgOpacityDefault=80&borderColorDefault=cccccc&fcDefault=444444&iconColorDefault=888888&bgColorHover=d8d8d8&bgTextureHover=02_glass.png&bgImgOpacityHover=90&borderColorHover=888888&fcHover=111111&iconColorHover=222222&bgColorActive=8ab9ff&bgTextureActive=02_glass.png&bgImgOpacityActive=50&borderColorActive=2694e8&fcActive=000000&iconColorActive=ffffff&bgColorContent=f3f3f3&fcContent=362b36&ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=normal&fsDefault=1.2&fsDefaultUnit=em#bgColorDefault=d6d6d6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=80&borderColorDefault=bbbbbb&fcDefault=000000&iconColorDefault=444444&bgColorHover=eeeeee&bgTextureHover=02_glass.png&bgImgOpacityHover=90&borderColorHover=cccccc&fcHover=000066&iconColorHover=000066&bgColorActive=80ade5&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=100&borderColorActive=266cc0&fcActive=000000&iconColorActive=ffffff&bgColorContent=D1E6FC&bgTextureContent=10_dots_medium.png&bgImgOpacityContent=90&borderColorContent=bbbbbb&fcContent=000000&iconColorContent=222222&ffDefault=Lucida+Grande%2C+Lucida+Sans%2C+Arial%2C+sans-serif&fwDefault=normal&fsDefault=1&fsDefaultUnit=em
 */
 
-/*
-*      GENERAL COSMETICS
-*/
+
 body {
-       font-family: Lucida Grande, Lucida Sans, Arial, Helvetica, sans-serif;
-       font-size: 100%;
-       background-color: #EEE;
+       font-family: Arial, Helvetica, Verdana, sans-serif;
+       font-size: 12px;
+       background-color: #f9f9f9;
 }
-h1 {
-       font-size: 2em;
+
+TABLE.TOC {
+       border: 1px solid #BBB;
+       border-collapse: collapse;
+       margin: 1em 0;
+       }
+       .TOC TR.rTitle TD{
+               font-size:              0.95em;
+               font-weight:    bold;
+               letter-spacing: 1px;
+               padding-top:    4px;
+               padding-bottom: 5px;
+               background:             #99B5B5;
+               color:                  #FFF
+       }
+       .TOC TR.r0 {
+               background:     #FFF;
+       }
+       .TOC TR.r0 {
+               background:     #EEE;
+               }
+               .TOC TD {
+                       padding: 2px 10px 4px;
+                       white-space: nowrap;
+                       border-left: 1px solid #BBB;
+               }
+
+
+H5 {
+       font-size: 1em;
        font-weight: normal;
-       margin: 1em 0 0.75em;
-       page-break-after: avoid;
+       line-height: 1em;
+       padding: 1em 0 5px;
+       margin: 1em 0 1em;
+       border-bottom: 1px dotted #CCC;
+       }
+       H5.withNext {
+               border-bottom: none;
+               padding-bottom: 0;
+               margin-bottom: -1em;
+       }
+       H5 A.bm {
+               font-weight: bold;
+               color:#C30;
+       }
+       H5 EM {
+               font-style: normal;
+               font-size: 0.9em;
+               float: right;
+               margin-top: -1.4em;
+       }
+
+#navigation {
+       border-bottom: 0;
 }
-h2 {
-       color: navy;
-       font-size: 1.2em;
-       font-weight: bold;
-       margin: 1.25em 0 0.75em;
-       page-break-after: avoid;
-}
-h3 {
-       font-size: 1.2em;
-       font-weight: bold;
-       margin: 0 0 1ex;
-       white-space: nowrap;
-       page-break-after: avoid;
-}
-p {
-       margin: 1ex 0;
-}
 
-code {
-       font-size: 1.1em;
-       margin: 0;
+UL, OL {
        }
-       pre {
-               margin: 1em 0 1em 1em;
+       LI {
+               padding-top: 2px;
+               padding-bottom: 3px;
        }
 
 
-
 /*
-*      COMMON LAYOUT PANE FORMATTING
-*/
-.pane ,                                /* outer pane class */
-.ui-layout-pane {      /* inner pane class */
-       background-color: #FFF;
-       border: 1px solid #777;
-       padding: 0;/* alignment & padding is on the inner-divs */
-       overflow: auto; /* will be auto-set to 'hidden' for any pane with a 
'scrolling content div' */
+ *     TABLE OF CONTENTS (West-pane)
+ */
+.ui-layout-west .ui-layout-content {
+       padding: 1ex 0.5em 2em 22px; /* need left-padding for +/- buttons */
 }
+UL#TOC {
+       list-style: none;
+       margin: 0;
+       padding: 0;
+       }
+       #TOC LI {
+               padding: 2px 0;
+               }
+               #TOC A {
+                       color: #000;
+                       display: block;
+                       padding: 1px 0 2px 3px;
+                       }
+                       #TOC A:visited {
+                               color: #000;
+                       }
+                       #TOC A:hover {
+                               color: #000;
+                               background-color: #FEC;
+                               text-decoration: none;
+                       }
+               #TOC LI UL {
+                       list-style: none;
+                       margin: 0;
+                       margin-left: 1em;
+                       padding: 0.25em 0;
+                       }
+                       #TOC LI UL LI {
+                               font-size: 0.9em;
+                               padding: 1px 0;
+                               }
+                               #TOC LI UL LI A {
+                                       padding-top: 0px;
+                                       padding-bottom: 1px;
+                               }
 
+       #TOC .tocBtn {
+               float:                  left;
+               margin-left:    -17px; /* move button into left-margin */
+               margin-top:             2px;
+               width:                  16px;
+               height:                 16px;
+               cursor:                 pointer;
+       }
 
-/*
-*      OUTER-LAYOUT PANE FORMATTING
-*/
-.pane-north ,
-.pane-south ,
-.pane-west ,
-.pane-east {
-       overflow:               hidden;
+
+H2 {
+       margin-bottom: 0;
 }
-.pane-north {
-       border-bottom:  none;
+DIV.collapsible {
+       padding: 0.75em 3px 3px;
+       border: 1px solid #FFF; /* same as page-color */
+       border-top: none;
+       position: relative;
        }
-       .pane-north .content ,
-       .pane-south .content {
-               text-align: center;
+       DIV.highlightCollapsible {
+               border: 1px dotted #566F6F; /* same as H2 border-bottom */
+               border-top: none;
        }
-.pane-center {
-       /* show off the inner-layout inside the outer-center-pane*/
-       background-color: #F6F6F6;
-       padding: 15px; /* for outer layout */
+       DIV.highlightCollapsible ,
+       DIV.highlightCollapsible PRE {
+               background-color: #F2F6F4;
+       }
+       DIV.collapsible H4 {
+               margin-top: 0 !important; /* div has padding-top */
+       }
+
+SPAN.expander {
+       float:          right;
+       margin-top:     3px;
+       width:          16px;
+       height:         16px;
+       cursor:         pointer;
+       }
+
+
+/*
+ *     LAYOUT PANE FORMATTING
+ */
+
+.ui-layout-north {
+       border-bottom: none;
+       background-color: #677;
 }
 
+.ui-layout-west {
+       background-color: #F9F9F9;
+       border:                 1px solid #677;
+       border-left:    0;
+       overflow: auto;
+}
+
+.ui-layout-center {
+       background-color: #FFF;
+       border: 1px solid #677;
+       padding: 15px 2em 3em;
+       overflow: auto;
+}
+
 /* inner divs inside Outer East/West panes */
-.header {
-       border-bottom: 1px solid #777;
+.layouheader {
+       background: #eee;
+       border-bottom: 1px solid #677;
        font-weight: bold;
        text-align: center;
        padding: 2px 0 4px;
        position: relative;
        overflow: hidden;
 }
-.subhead ,
-.footer {
-       padding: 3px 10px;
-       font-size: 0.85em;
-       position: relative;
-       overflow: hidden;
-       white-space: nowrap;
-}
-.subhead { border-bottom: 1px solid #777; }
-.footer  { border-top: 1px solid #777; }
-#mainContent .footer  { border-top: 1px solid #BBB; }
-.content {
-       padding:        10px;
-       position:       relative;
-       overflow:       auto;
-}
 
 
-
-
 /*
-*      OUTER LAYOUT RESIZERS & TOGGLERS
+*      LAYOUT RESIZERS & TOGGLERS
 */
 
-/* north-pane is not resizable
-.resizer-north-dragging ,
-.resizer-north:hover           { background: url(../img/resizable-n.gif) 
repeat-x center; }*/
-.resizer-south-dragging ,
-.resizer-south:hover           { background: url(../img/resizable-s.gif) 
repeat-x center; }
-
-.resizer-west-dragging ,
-.resizer-west-open:hover       { background: url(../img/resizable-w.gif) 
repeat-y center; }
-.resizer-east-dragging ,
-.resizer-east-open:hover       { background: url(../img/resizable-e.gif) 
repeat-y center; }
-
-.resizer-west-open ,
-.resizer-east-open {
-       background-color: #999;
+.ui-layout-resizer-sliding {
        opacity: 0.1;
        filter: alpha(opacity=10);
+       background-color: #999;
 }
-.resizer-west-open:hover ,
-.resizer-east-open:hover {
+.ui-layout-resizer-sliding:hover {
        opacity: 1;
        filter: alpha(opacity=100);
 }
-.resizer-dragging {
-       /* see draggable.opacity option
-       opacity: 0.5;
-       filter: alpha(opacity=50);
-       */
-}
-.resizer-dragging-limit        { background: #FF3300 !important; }
 
+/* north-pane is not resizable*/
+/*
+.ui-layout-resizer-north-dragging ,
+.ui-layout-resizer-north:hover         { background: 
url(/lib/img/resizable-n.gif) repeat-x center; }
+.ui-layout-resizer-south-dragging ,
+.ui-layout-resizer-south:hover         { background: 
url(/lib/img/resizable-s.gif) repeat-x center; }
+
+.ui-layout-resizer-west-dragging ,
+.ui-layout-resizer-west-open:hover     { background: 
url(/lib/img/resizable-w.gif) repeat-y center; }
+.ui-layout-resizer-east-dragging ,
+.ui-layout-resizer-east-open:hover     { background: 
url(/lib/img/resizable-e.gif) repeat-y center; }
+*/
 /* IE6 * HACK - always show resizer graphics because IE6 cannot understand 
elem:hover */
-/** html .resizer-north                { background: 
url(../img/resizable-n.gif) repeat-x center !important; } */
-* html .resizer-south          { background: url(../img/resizable-s.gif) 
repeat-x center !important; }
-* html .resizer-west-open      { background: url(../img/resizable-w.gif) 
repeat-y center !important; }
-* html .resizer-east-open      { background: url(../img/resizable-e.gif) 
repeat-y center !important; }
-/** html .resizer-north , */
-* html .resizer-south ,
-* html .resizer-west-open ,
-* html .resizer-east-open {
-       opacity: 0.1 !important;
-       filter: alpha(opacity=10) !important;
-}
-
+/** html .ui-layout-resizer-north              { background: 
url(../lib/img/resizable-n.gif) repeat-x center !important; } */
 /*
-*      SIMPLE TOGGLER BUTTONS (used on Outer Layout North/South only)
+* html .ui-layout-resizer-south                { background: 
url(/lib/img/resizable-s.gif) repeat-x center  !important; }
+* html .ui-layout-resizer-west-open    { background: 
url(/lib/img/resizable-w.gif) repeat-y center  !important; }
+* html .ui-layout-resizer-east-open    { background: 
url(/lib/img/resizable-e.gif) repeat-y center  !important; }
 */
-
-.toggler-north-open ,
-.toggler-south-closed          { background: url(../img/toggle-up.gif) 
no-repeat center bottom; }
-.toggler-north-closed ,
-.toggler-south-open            { background: url(../img/toggle-dn.gif) 
no-repeat center top; }
 /*
-.toggler-east-closed ,
-.toggler-west-open    { background: url(../img/toggle-lt.gif) no-repeat center 
right; }
-.toggler-west-closed ,
-.toggler-east-open    { background: url(../img/toggle-rt.gif) no-repeat center 
left; }
+*      SIMPLE TOGGLER BUTTONS
 */
-
 /*
-*      extJS-STYLE RESIZER/SLIDER-BAR (CLOSED)
+.ui-layout-toggler-north-open ,
+.ui-layout-toggler-south-closed { background: url(/lib/img/toggle-up.gif) 
no-repeat center bottom; }
+.ui-layout-toggler-north-closed ,
+.ui-layout-toggler-south-open   { background: url(/lib/img/toggle-dn.gif) 
no-repeat center top; }
+.ui-layout-toggler-east-closed ,
+.ui-layout-toggler-west-open    { background: url(/lib/img/toggle-lt.gif) 
no-repeat center right; }
 */
-.resizer-west-closed ,
-.resizer-east-closed {
-       background: #D1E6FC 
url(../img/D1E6FC_40x100_textures_10_dots_medium_90.png) 0 0 repeat;
-       border-top: 1px solid #777;
-       border-bottom: 1px solid #777;
-}
-.resizer-west-closed:hover ,
-.resizer-east-closed:hover {
-       background: #D1E6FC;
-}
-
+/*.ui-layout-toggler-west-closed , SEE west-closed BELOW */
 /*
-*      NORTH PANE TOOLBAR & BUTTONS
+.ui-layout-toggler-east-open    { background: url(/lib/img/toggle-rt.gif) 
no-repeat center left; }
 */
-
-ul.toolbar {
-       position:       relative;
-       overflow:       hidden; /* required to CONTAINER 'floating li' in FF */
-       height:         auto;
-       margin:         0;
-       padding:        2px;
-       width:          100%;
-       list-style:     none;
-       text-align: left;
-       background: #D6D6D6 url(../img/d6d6d6_40x100_textures_02_glass_80.png) 
0 50% repeat-x;
-       border-top: 1px solid #BBB;
+/* 'CONTENTS' TOC TOGGLER BUTTON */
+.ui-layout-resizer-west-closed {
+       background-color:       #DDD;
+       border-top:                     1px solid #677;
+       border-bottom:          1px solid #677;
+       border-left:            1px solid #677;
        }
-       ul.toolbar li {
-               font-size: 0.9em;
-               margin: 0;
-               padding: 2px 7px;
-               float: left;
-               color: #000;
-               border: 1px solid transparent;
-               border-right-color: #BBB;
-               cursor: pointer;
-       }
-       ul.toolbar li:hover {
-               color: #005;
-               background: #EEE 
url(../img/eeeeee_40x100_textures_02_glass_90.png) 0 50% repeat-x;
-               border-top-color: #BBB;
-               border-bottom-color: #BBB;
-       }
-       ul.toolbar li.first:hover {
-               border-left-color: #BBB;
+       .ui-layout-resizer-west-closed:hover {
+               background-color: #E6E6E6;
                }
-               ul.toolbar li span {
-                       /* icons in toolbar */
-                       width:                  15px;
-                       height:                 15px;
-                       margin-left:    -3px;
-                       margin-right:   0.75ex;
-                       vertical-align: middle;
-                       opacity:                0.6;
-                       filter:                 alpha(opacity=60);
-                       display:                block;
-                       display:                inline-block;
+               .ui-layout-resizer-west-closed:hover .content {
+                       color: #C30;
                }
-               ul.toolbar li:hover span {
-                       opacity: 1;
-                       filter: alpha(opacity=100);
+       .ui-layout-toggler-west-closed {
+               background-color:       #EEE;
+               border-top:                     1px solid #FFF;
+               border-left:            1px solid #FFF;
+               border-bottom:          1px solid #677;
                }
-               li.button-toggle-north span     ,
-               li.button-open-south span       { background: 
url(../img/go-up-on.gif) no-repeat center; }
-               li.button-close-south span      { background: 
url(../img/go-dn-on.gif) no-repeat center; }
-               li.button-pin-up span           { background: 
url(../img/pin-up-on.gif) no-repeat center; }
-               li.button-pin-down span         { background: 
url(../img/pin-dn-on.gif) no-repeat center; }
-
-/*
- *     extJS-STYLE TOGGLE & PIN BUTTONS
- *
- *     these 'extra buttons' are INSIDE the east/west panes
- */
-
-/* CUSTOM pin/close buttons */
-span.button-pin ,
-span.button-close {
-       position:       absolute;
-       top:            0;
-       width:          20px;
-       height:         20px;
-       z-index:        2;
-       display:        block;
-       cursor:         pointer;
-}
-span.button-close-west { left:  0; }
-span.button-close-east { right: 0; }
-span.button-pin-west   { right: 1px; }
-span.button-pin-east   { left:  1px; }
-
-/* CUSTOM pin-buttons */
-span.button-pin-up                             { background: 
url(../img/pin-up-off.gif) no-repeat center; }
-span.button-pin-up:hover               { background: url(../img/pin-up-on.gif) 
 no-repeat center; }
-span.button-pin-down                   { background: 
url(../img/pin-dn-off.gif) no-repeat center; }
-span.button-pin-down:hover             { background: url(../img/pin-dn-on.gif) 
 no-repeat center; }
-
-/* CUSTOM close-buttons */
-span.button-close-west                 { background: url(../img/go-lt-off.gif) 
no-repeat center; }
-span.button-close-west:hover   { background: url(../img/go-lt-on.gif)  
no-repeat center; }
-span.button-close-east                 { background: url(../img/go-rt-off.gif) 
no-repeat center; }
-span.button-close-east:hover   { background: url(../img/go-rt-on.gif)  
no-repeat center; }
-
-/* STANDARD toggler-buttons - when the east/west panes are 'closed' */
-.toggler-west-closed           { background: url(../img/go-rt-off.gif) 
no-repeat center; }
-.toggler-west-closed:hover     { background: url(../img/go-rt-on.gif)  
no-repeat center; }
-.toggler-east-closed           { background: url(../img/go-lt-off.gif) 
no-repeat center; }
-.toggler-east-closed:hover     { background: url(../img/go-lt-on.gif)  
no-repeat center; }
-
-
-/*
-*      INNER LAYOUT RESIZERS & TOGGLERS
-*
-*      These styles target 'children of center pane', so only affect the Inner 
Layout
-*      This layout has applyDefaultCSS=true, so use !important to override 
defaults
-*/
-
-#mainContent .ui-layout-resizer-closed:hover   { background: #FFEDCA 
!important; }
-#mainContent .ui-layout-resizer-open:hover ,
-#mainContent .ui-layout-resizer-dragging               { background: #C4E1A4 
!important; }
-#mainContent .ui-layout-resizer-dragging-limit { background: #FF3300 
!important; }
-
-#mainContent .ui-layout-resizer-north ,
-#mainContent .ui-layout-resizer-south          { border-left:  1px solid #BBB 
!important;
-                                                                               
          border-right: 1px solid #BBB !important; }
-#mainContent .ui-layout-resizer-north-closed{ border-top:   1px solid #BBB 
!important; }
-#mainContent .ui-layout-resizer-south-closed{ border-bottom:1px solid #BBB 
!important; }
-#mainContent .ui-layout-resizer-west-closed    { border-left:  1px solid #BBB 
!important; }
-#mainContent .ui-layout-resizer-east-closed    { border-right: 1px solid #BBB 
!important; }
-
-#mainContent .ui-layout-resizer:hover .ui-layout-toggler {
-       opacity: 0.4;
-       filter: alpha(opacity=40);
-}
-#mainContent .ui-layout-resizer:hover .ui-layout-toggler:hover {
-       opacity: 1;
-       filter: alpha(opacity=100);
-       background: #FD9 !important;
-       border-color: #CB7 !important;
-}
-
-#mainContent .ui-layout-resizer-sliding {
-       opacity: 0.3;
-       filter: alpha(opacity=30);
-}
-#mainContent .ui-layout-resizer-sliding:hover {
-       opacity: 1;
-       filter: alpha(opacity=100);
-}
-#mainContent .ui-layout-resizer-sliding .ui-layout-toggler {
-       display: none !important;
-}
-#mainContent .ui-layout-resizer-sliding:hover .ui-layout-toggler {
-       display: block !important;
-}
-
-
-
-
+               .ui-layout-toggler-west-closed:hover {
+                       background-color: #F6F6F6;
+               }
+               .ui-layout-toggler-west-closed .content {
+                       color:                  #033;
+                       font-size:              12px !important;
+                       font-weight:    bold;
+                       text-transform: uppercase;
+                       text-align:             center;
+                       padding-right:  1px;
+               }
+.button-bar {
+    background-color: #a4c2c2;
+    border-bottom: 1px solid #fff;
+    border-top: 1px solid #fff;
+    padding: 5px 5px 7px 3em;
+       font-weight:    bold;
+       text-align:             center;
+}
\ No newline at end of file

Modified: branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl       
2015-11-27 11:09:35 UTC (rev 14494)
+++ branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl       
2015-11-27 15:31:47 UTC (rev 14495)
@@ -1,10 +1,8 @@
-                                       </div>
-                               </div>
                        </div>
 
-                       <div class="ui-layout-east">
+                       <!--div class="ui-layout-east">
                                <div class="header">Outer - East</div>
-                       </div>
+                       </div-->
                        <div class="ui-layout-south">
                                <div class="body">
                                        <div class="button-bar">
@@ -13,10 +11,6 @@
                                </div>
                        </div>
                </div>
-               <div id="lightbox-login" 
style="background-color:#000000;color:#FFFFFF;display:none">
-                       <div class="hd" 
style="background-color:#000000;color:#000000; border:0; text-align:center"> 
{lang_login} </div>
-                       <div class="bd" style="text-align:center;"> </div>
-               </div>
                <div id="popupBox"></div>       
                <div id="curtain"></div>
        </body>

Modified: branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php     
2015-11-27 11:09:35 UTC (rev 14494)
+++ branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php     
2015-11-27 15:31:47 UTC (rev 14495)
@@ -56,7 +56,7 @@
 
        $stylesheets = array();
        $stylesheets[] = "/phpgwapi/templates/pure/css/global.css";
-       $stylesheets[] = "/phpgwapi/templates/pure/css/demo_mmenu.css";
+//     $stylesheets[] = "/phpgwapi/templates/pure/css/demo_mmenu.css";
        $stylesheets[] = "/phpgwapi/templates/pure/css/pure-min.css";
        $stylesheets[] = "/phpgwapi/templates/pure/css/pure-extension.css";
        $stylesheets[] = 
"/phpgwapi/templates/pure/css/grids-responsive-min.css";
@@ -143,7 +143,9 @@
                'webserver_url' => 
$GLOBALS['phpgw_info']['server']['webserver_url'],
                'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
                'border_layout_config' => $_border_layout_config,
-               'navbar_config' => $_navbar_config
+               'navbar_config' => $_navbar_config,
+               'lang_collapse_all'     => lang('collapse all'),
+               'lang_expand_all'       => lang('expand all')
        );
 
        $GLOBALS['phpgw']->template->set_var($tpl_vars);

Modified: branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/js/base.js       
2015-11-27 11:09:35 UTC (rev 14494)
+++ branches/dev-syncromind/phpgwapi/templates/portico/js/base.js       
2015-11-27 15:31:47 UTC (rev 14495)
@@ -1,199 +1,45 @@
-/*
- * complex.html
- *
- * This is a demonstration page for the jQuery layout widget
- *
- *     NOTE: For best code readability, view this with a fixed-space font and 
tabs equal to 4-chars
- */
+       var pageLayout;
 
-       var outerLayout, innerLayout;
-
-       /*
-       *#######################
-       *     ON PAGE LOAD
-       *#######################
-       */
-       $(document).ready( function() {
-               // create the OUTER LAYOUT
-               outerLayout = $("body").layout( layoutSettings_Outer );
-
-               /*******************************
-                ***  CUSTOM LAYOUT BUTTONS  ***
-                *******************************
-                *
-                * Add SPANs to the east/west panes for customer "close" and 
"pin" buttons
-                *
-                * COULD have hard-coded span, div, button, image, or any 
element to use as a 'button'...
-                * ... but instead am adding SPANs via script - THEN attaching 
the layout-events to them
-                *
-                * CSS will size and position the spans, as well as set the 
background-images
-                */
-
-               // BIND events to hard-coded buttons in the NORTH toolbar
-               outerLayout.addToggleBtn( "#tbarToggleNorth", "north" );
-               outerLayout.addOpenBtn( "#tbarOpenSouth", "south" );
-               outerLayout.addCloseBtn( "#tbarCloseSouth", "south" );
-               outerLayout.addPinBtn( "#tbarPinWest", "west" );
-               outerLayout.addPinBtn( "#tbarPinEast", "east" );
-
-               // save selector strings to vars so we don't have to repeat it
-               // must prefix paneClass with "body > " to target ONLY the 
outerLayout panes
-               var westSelector = "body > .ui-layout-west"; // outer-west pane
-               var eastSelector = "body > .ui-layout-east"; // outer-east pane
-
-                // CREATE SPANs for pin-buttons - using a generic class as 
identifiers
-               $("<span></span>").addClass("pin-button").prependTo( 
westSelector );
-               $("<span></span>").addClass("pin-button").prependTo( 
eastSelector );
-               // BIND events to pin-buttons to make them functional
-               outerLayout.addPinBtn( westSelector +" .pin-button", "west");
-               outerLayout.addPinBtn( eastSelector +" .pin-button", "east" );
-
-                // CREATE SPANs for close-buttons - using unique IDs as 
identifiers
-               $("<span></span>").attr("id", "west-closer" ).prependTo( 
westSelector );
-               $("<span></span>").attr("id", "east-closer").prependTo( 
eastSelector );
-               // BIND layout events to close-buttons to make them functional
-               outerLayout.addCloseBtn("#west-closer", "west");
-               outerLayout.addCloseBtn("#east-closer", "east");
-
-               // DEMO HELPER: prevent hyperlinks from reloading page when a 
'base.href' is set
-               $("a").each(function () {
-                       var path = document.location.href;
-                       if (path.substr(path.length-1)=="#") path = 
path.substr(0,path.length-1);
-                       if (this.href.substr(this.href.length-1) == "#") 
this.href = path +"#";
-               });
-
-       });
-
-
-       /*
-       *#######################
-       * INNER LAYOUT SETTINGS
-       *#######################
-       *
-       * These settings are set in 'list format' - no nested data-structures
-       * Default settings are specified with just their name, like: 
fxName:"slide"
-       * Pane-specific settings are prefixed with the pane name + 
2-underscores: north__fxName:"none"
-       */
-       layoutSettings_Inner = {
-               applyDefaultStyles:                             true // basic 
styling for testing & demo purposes
-       ,       minSize:                                                20 // 
TESTING ONLY
-       ,       spacing_closed:                                 14
-       ,       north__spacing_closed:                  8
-       ,       south__spacing_closed:                  8
-       ,       north__togglerLength_closed:    -1 // = 100% - so cannot 'slide 
open'
-       ,       south__togglerLength_closed:    -1
-       ,       fxName:                                                 "slide" 
// do not confuse with "slidable" option!
-       ,       fxSpeed_open:                                   1000
-       ,       fxSpeed_close:                                  2500
-       ,       fxSettings_open:                                { easing: 
"easeInQuint" }
-       ,       fxSettings_close:                               { easing: 
"easeOutQuint" }
-       ,       north__fxName:                                  "none"
-       ,       south__fxName:                                  "drop"
-       ,       south__fxSpeed_open:                    500
-       ,       south__fxSpeed_close:                   1000
-       //,     initClosed:                                             true
-       ,       center__minWidth:                               200
-       ,       center__minHeight:                              200
-       };
-
-
-       /*
-       *#######################
-       * OUTER LAYOUT SETTINGS
-       *#######################
-       *
-       * This configuration illustrates how extensively the layout can be 
customized
-       * ALL SETTINGS ARE OPTIONAL - and there are more available than shown 
below
-       *
-       * These settings are set in 'sub-key format' - ALL data must be in a 
nested data-structures
-       * All default settings (applied to all panes) go inside the defaults:{} 
key
-       * Pane-specific settings go inside their keys: north:{}, south:{}, 
center:{}, etc
-       */
-       var layoutSettings_Outer = {
-               name: "outerLayout" // NO FUNCTIONAL USE, but could be used by 
custom code to 'identify' a layout
-               // options.defaults apply to ALL PANES - but overridden by 
pane-specific settings
-       ,       defaults: {
-                       size:                                   "auto"
-               ,       minSize:                                50
-               ,       paneClass:                              "pane"          
// default = 'ui-layout-pane'
-               ,       resizerClass:                   "resizer"       // 
default = 'ui-layout-resizer'
-               ,       togglerClass:                   "toggler"       // 
default = 'ui-layout-toggler'
-               ,       buttonClass:                    "button"        // 
default = 'ui-layout-button'
-               ,       contentSelector:                ".content"      // 
inner div to auto-size so only it scrolls, not the entire pane!
-               ,       contentIgnoreSelector:  "span"          // 
'paneSelector' for content to 'ignore' when measuring room for content
-               ,       togglerLength_open:             35                      
// WIDTH of toggler on north/south edges - HEIGHT on east/west edges
-               ,       togglerLength_closed:   35                      // 
"100%" OR -1 = full height
-               ,       hideTogglerOnSlide:             true            // hide 
the toggler when pane is 'slid open'
-               ,       togglerTip_open:                "Close This Pane"
-               ,       togglerTip_closed:              "Open This Pane"
-               ,       resizerTip:                             "Resize This 
Pane"
-               //      effect defaults - overridden on some panes
-               ,       fxName:                                 "slide"         
// none, slide, drop, scale
-               ,       fxSpeed_open:                   750
-               ,       fxSpeed_close:                  1500
-               ,       fxSettings_open:                { easing: "easeInQuint" 
}
-               ,       fxSettings_close:               { easing: 
"easeOutQuint" }
-       }
-       ,       north: {
-                       spacing_open:                   1                       
// cosmetic spacing
-               ,       togglerLength_open:             0                       
// HIDE the toggler button
-               ,       togglerLength_closed:   -1                      // 
"100%" OR -1 = full width of pane
-               ,       resizable:                              false
-               ,       slidable:                               false
-               //      override default effect
-               ,       fxName:                                 "none"
-               }
-       ,       south: {
+       $(document).ready(function(){
+               // create page layout
+               pageLayout = $('body').layout({
+                       stateManagement__enabled:       true
+               ,       defaults: {
+                       }
+               ,       north: {
+                               size:                                   "auto"
+                       ,       spacing_open:                   0
+                       ,       closable:                               false
+                       ,       resizable:                              false
+                       }
+               ,       west: {
+                               size:                                   250
+                       ,       spacing_closed:                 22
+                       ,       togglerLength_closed:   140
+                       ,       togglerAlign_closed:    "top"
+                       ,       togglerContent_closed:  
"C<BR>o<BR>n<BR>t<BR>e<BR>n<BR>t<BR>s"
+                       ,       togglerTip_closed:              "Open & Pin 
Contents"
+                       ,       sliderTip:                              "Slide 
Open Contents"
+                       ,       slideTrigger_open:              "mouseover"
+                       ,       initClosed:                             true
+                       }
+               ,       south: {
                        maxSize:                                200
                ,       spacing_closed:                 0                       
// HIDE resizer & toggler when 'closed'
                ,       slidable:                               false           
// REFERENCE - cannot slide if spacing_closed = 0
                ,       initClosed:                             false
-               //      CALLBACK TESTING...
-               ,       onhide_start:                   function () { return 
confirm("START South pane hide \n\n onhide_start callback \n\n Allow pane to 
hide?"); }
-               ,       onhide_end:                             function () { 
alert("END South pane hide \n\n onhide_end callback"); }
-               ,       onshow_start:                   function () { return 
confirm("START South pane show \n\n onshow_start callback \n\n Allow pane to 
show?"); }
-               ,       onshow_end:                             function () { 
alert("END South pane show \n\n onshow_end callback"); }
-               ,       onopen_start:                   function () { return 
confirm("START South pane open \n\n onopen_start callback \n\n Allow pane to 
open?"); }
-               ,       onopen_end:                             function () { 
alert("END South pane open \n\n onopen_end callback"); }
-               ,       onclose_start:                  function () { return 
confirm("START South pane close \n\n onclose_start callback \n\n Allow pane to 
close?"); }
-               ,       onclose_end:                    function () { 
alert("END South pane close \n\n onclose_end callback"); }
-               //,     onresize_start:                 function () { return 
confirm("START South pane resize \n\n onresize_start callback \n\n Allow pane 
to be resized?)"); }
-               ,       onresize_end:                   function () { 
alert("END South pane resize \n\n onresize_end callback \n\n NOTE: 
onresize_start event was skipped."); }
-               }
-       ,       west: {
-                       size:                                   250
-               ,       spacing_closed:                 21                      
// wider space when closed
-               ,       togglerLength_closed:   21                      // make 
toggler 'square' - 21x21
-               ,       togglerAlign_closed:    "top"           // align to top 
of resizer
-               ,       togglerLength_open:             0                       
// NONE - using custom togglers INSIDE west-pane
-               ,       togglerTip_open:                "Close West Pane"
-               ,       togglerTip_closed:              "Open West Pane"
-               ,       resizerTip_open:                "Resize West Pane"
-               ,       slideTrigger_open:              "click"         // 
default
-               ,       initClosed:                             true
-               //      add 'bounce' option to default 'slide' effect
-               ,       fxSettings_open:                { easing: 
"easeOutBounce" }
-               }
-       ,       east: {
-                       size:                                   250
-               ,       spacing_closed:                 21                      
// wider space when closed
-               ,       togglerLength_closed:   21                      // make 
toggler 'square' - 21x21
-               ,       togglerAlign_closed:    "top"           // align to top 
of resizer
-               ,       togglerLength_open:             0                       
// NONE - using custom togglers INSIDE east-pane
-               ,       togglerTip_open:                "Close East Pane"
-               ,       togglerTip_closed:              "Open East Pane"
-               ,       resizerTip_open:                "Resize East Pane"
-               ,       slideTrigger_open:              "mouseover"
-               ,       initClosed:                             true
-               //      override default effect, speed, and settings
-               ,       fxName:                                 "drop"
-               ,       fxSpeed:                                "normal"
-               ,       fxSettings:                             { easing: "" } 
// nullify default easing
-               }
-       ,       center: {
-                       paneSelector:                   "#mainContent"          
        // sample: use an ID to select pane instead of a class
-               ,       minWidth:                               200
-               ,       minHeight:                              200
-               }
-       };
+                       }
 
+               });
+
+               $('#collapseNavbar').on('click', function () {
+                       $(this).attr('href', 'javascript:;');
+                       $('#navbar').jstree('close_all');
+               })
+
+               $('#expandNavbar').on('click', function () {
+                       $(this).attr('href', 'javascript:;');
+                       $('#navbar').jstree('open_all');
+               });
+
+       });
\ No newline at end of file

Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php   
2015-11-27 11:09:35 UTC (rev 14494)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php   
2015-11-27 15:31:47 UTC (rev 14495)
@@ -193,13 +193,25 @@
                                                plugins: ["state", "search"]
                                        });
                                        var to = false;
-                                       $('#plugins4_q').keyup(function () {
+                                       $('#navbar_search').keyup(function () {
                                                if(to) { clearTimeout(to); }
                                                to = setTimeout(function () {
-                                                       var v = 
$('#plugins4_q').val();
+                                                       var v = 
$('#navbar_search').val();
                                                        
$('#navbar').jstree(true).search(v);
                                                }, 250);
                                        });
+                                       $('#navbar').bind('select_node.jstree', 
function(e,data) {
+                                               if (typeof (data.event) == 
'undefined')
+                                               {
+                                                       return false;
+                                               }
+                               //              var treeInst = 
$('#treeDiv1').jstree(true);
+                               //              treeInst.save_state();
+                                               setTimeout(function() {
+                                                       window.location.href = 
data.node.a_attr.href;
+                                               }, 100);
+
+                                       });
                                });
                        </script>
 JS;
@@ -298,19 +310,30 @@
                        $current_class = 'current';
                }
 
-               $link_class =" class=\"{$current_class}{$parent_class}\"";
+               $link_class = " class=\"{$current_class}{$parent_class}\"";
+               $id=" id=\"{$id}\"";
+               /**
+                * Sigurd: Block class for treeview
+                */
+               $link_class = '';//" class=\"{$current_class}{$parent_class}\"";
+               $expand_class = '';
+               $icon_style = '';
+               $id                     = '';
 
                $out = <<<HTML
                                <li{$expand_class}>
 
 HTML;
-               if( $expand_class )
+/*
+ *             Sigurd: img treeview
+ *             if( $expand_class )
                {
                $out .= <<<HTML
                                                        <img 
src="{$blank_image}"{$expand_class}width="16" height="16" alt="+/-" />
 
 HTML;
                }
+ */
                $target = '';
                if(isset($item['target']))
                {
@@ -323,9 +346,7 @@
 
                return <<<HTML
 $out
-                                       <a 
href="{$item['url']}"{$link_class}{$icon_style} id="{$id}" {$target}>
-                                               <span>{$item['text']}</span>
-                                       </a>
+                                       <a 
href="{$item['url']}"{$link_class}{$icon_style}{$id}{$target}>{$item['text']}</a>
 {$children}
                                </li>
 

Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl       
2015-11-27 11:09:35 UTC (rev 14494)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl       
2015-11-27 15:31:47 UTC (rev 14495)
@@ -15,54 +15,55 @@
                                        window.open(sUrl,'_self');
                                }
                        </script>
-
                        <div class="ui-layout-north">
-                               <div class="body">
-                                       <h3 class="icon">{site_title}</h3>
-                                       <div class="button-bar">
-                                                       <a href="{print_url}" 
class="icon icon-print" target="_blank">
-                                                       {print_text}
-                                               </a>
-                                               <a href="{home_url}" 
class="icon icon-home">
-                                                       {home_text}
-                                               </a>
-                                               <a href="{debug_url}" 
class="icon icon-debug">
-                                                       {debug_text}
-                                               </a>
-                                               <a href="{about_url}" 
class="icon icon-about">
-                                                       {about_text}
-                                               </a>
-                                               <a href="{support_url}" 
class="{support_icon}">
-                                                       {support_text}
-                                               </a>
-                                               <a href="{help_url}" 
class="{help_icon}">
-                                                       {help_text}
-                                               </a>
-                                               <a href="{preferences_url}" 
class="icon icon-preferences">
-                                                       {preferences_text}
-                                               </a>
-                                               <a href="javascript:logout();" 
class="icon icon-logout">
-                                                       {logout_text}
-                                               </a>
-                                       </div>
+                               <div id="logo">{site_title}</div>
+                                       <div id="navigation">
+                                               <a href="{print_url}" 
class="icon icon-print" target="_blank">
+                                               {print_text}
+                                       </a>
+                                       <a href="{home_url}" class="icon 
icon-home">
+                                               {home_text}
+                                       </a>
+                                       <a href="{debug_url}" class="icon 
icon-debug">
+                                               {debug_text}
+                                       </a>
+                                       <a href="{about_url}" class="icon 
icon-about">
+                                               {about_text}
+                                       </a>
+                                       <a href="{support_url}" 
class="{support_icon}">
+                                               {support_text}
+                                       </a>
+                                       <a href="{help_url}" 
class="{help_icon}">
+                                               {help_text}
+                                       </a>
+                                       <a href="{preferences_url}" class="icon 
icon-preferences">
+                                               {preferences_text}
+                                       </a>
+                                       <a href="javascript:logout();" 
class="icon icon-logout">
+                                               {logout_text}
+                                       </a>
                                </div>
                        </div>
 
-                       <div class="ui-layout-west">
-                               <div>
-                                       <h2>{user_fullname}</h2>
+
+                       <div class="ui-layout-west" style="display: none;">
+                               <div class="layouheader">{user_fullname}</div>
+                               <input type="text" id="navbar_search" value="" 
class="input" style="margin:0em auto 1em auto; display:block; padding:4px; 
border-radius:4px; border:1px solid silver;" />
+                               <div id="navtreecontrol">
+                                       <a id="collapseNavbar" title="Collapse 
the entire tree below" href="#">
+                                               {lang_collapse_all}
+                                       </a>
+                                       |
+                                       <a id="expandNavbar" title="Expand the 
entire tree below" href="#">
+                                               {lang_expand_all}
+                                       </a>
                                </div>
 
-                               <input type="text" id="plugins4_q" value="" 
class="input" style="margin:0em auto 1em auto; display:block; padding:4px; 
border-radius:4px; border:1px solid silver;" />
-                               <div id="navbar">
+                               <div id="navbar" class="ui-layout-content" 
style="overflow: auto;">
 {treemenu}
                                </div>
                        </div>
 
-                       <div id="mainContent">
-                               <div class="ui-layout-center">
-                                       <div class="header">
-                                               <h3>{current_app_title}</h3>
-                                       </div>
-                                       <div class="ui-layout-content">
+                       <div class="ui-layout-center content">
+                               <h1 id="top">{current_app_title}</h1>
                                        

Modified: branches/dev-syncromind/property/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind/property/setup/phpgw_no.lang        2015-11-27 
11:09:35 UTC (rev 14494)
+++ branches/dev-syncromind/property/setup/phpgw_no.lang        2015-11-27 
15:31:47 UTC (rev 14495)
@@ -353,7 +353,7 @@
 close order    property        no      Avslutt Ordre
 close this window      property        no      Steng vindu
 code   property        no      Kode
-collapse all   property        no      Slå samen
+collapse all   common  no      Slå samen
 column could not be added      property        no      Kolonne kunne ikke 
legges til
 column description     property        no      Beskrivelse av kolonne
 column name    property        no      Kolonnenavn
@@ -809,7 +809,7 @@
 events property        no      Hendelser
 example        property        no      Eksempel
 exception      property        no      Utgår
-expand all     property        no      Vis alle
+expand all     common  no      Vis alle
 exp date       property        no      Utgått dato
 export contacts        property        no      Eksporter kontakter
 export date    property        no      Eksport dato




reply via email to

[Prev in Thread] Current Thread [Next in Thread]