[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14494] test new portico-layout
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14494] test new portico-layout |
|
Date: |
Fri, 27 Nov 2015 11:09:37 +0000 |
Revision: 14494
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14494
Author: sigurdne
Date: 2015-11-27 11:09:35 +0000 (Fri, 27 Nov 2015)
Log Message:
-----------
test new portico-layout
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
Modified: branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
2015-11-27 00:29:08 UTC (rev 14493)
+++ branches/dev-syncromind/phpgwapi/templates/portico/css/base.css
2015-11-27 11:09:35 UTC (rev 14494)
@@ -2,132 +2,8 @@
Border-layout for CSS only layout
*/
-body {
- height: 100%;
- background: #edf5ff;
-}
-div#border-layout {
- text-align: left;
-}
-
-div#border-layout div.layout-north,
-div#border-layout div.layout-south
-{
-
- position: absolute;
- left: 0;
- height: 26px;
- width: 100%;
-}
-
-div#border-layout div.layout-north
-{
- top: 0;
-}
-
-div#border-layout div.layout-south
-{
- bottom: 0;
-}
-
-div#border-layout div.layout-west,
-div#border-layout div.layout-east
-{
- position: absolute;
- top: 31px;
- bottom: 31px;
- width: 194px;
-}
-
-div#border-layout div.layout-west
-{
- left: 5px;
-}
-
-div#border-layout div.layout-east
-{
- right: 5px;
-}
-
-div#border-layout div.layout-center {
- position: absolute;
- top: 31px;
- bottom: 31px;
- left: 204px;
- right: 204px;
-}
-
-div#border-layout div.header
-{
- height: 23px;
- border: 1px solid #808080;
- border-bottom: none;
- background: #3f6ad1;
-}
-div#border-layout div.header h2
-{
- font-size: 1em;
- margin: 0px 3px;
- color: #fff;
- font-weight: bold;
- line-height: 22px;
-}
-div#border-layout div.breadcrumbs
-{
- font-size: 1em;
- margin: 0px 3px;
- color: #fff;
- font-weight: bold;
- line-height: 11px;
-}
-
-div#border-layout div.layout-west div.body,
-div#border-layout div.layout-east div.body,
-div#border-layout div.layout-center div.body
-{
- background: #fff;
- position: absolute;
- overflow: auto;
- top: 23px;
- bottom: 0em;
- border: 1px solid #808080;
- left: 0px;
- right: 0px;
-}
-
-div#border-layout div.layout-center div.body
-{
- background: #fff;
-}
-
-
/*
- Border-layout for JS layout
-*/
-.yui-skin-sam .yui-layout .yui-layout-unit-top div.yui-layout-bd,
-.yui-skin-sam .yui-layout .yui-layout-unit-bottom div.yui-layout-bd
-{
- border: none;
-}
-
-.yui-skin-sam .yui-layout div.header
-{
- display: none;
-}
-
-.yui-skin-sam .yui-layout div.yui-layout-unit div.yui-layout-bd
-{
- background-color: #fff;
-}
-
-.yui-skin-sam .yui-layout div.yui-layout-unit div.yui-layout-hd h2
-{
- font-size: 1em;
- margin: 0;
-}
-
-/*
Border-layout common for CSS and JS layout
*/
@@ -174,75 +50,6 @@
/*
- Navbar layout
-*/
-
-ul#navbar
-{
- /*background: #fff;*/
-}
-
-ul#navbar li
-{
- display: block;
- white-space: nowrap;
-}
-
-ul#navbar li a
-{
- color: #000;
- text-decoration: none;
- background-repeat: no-repeat;
- background-position: left center;
- display: inline-block;
- padding-left: 20px;
- margin-left: 20px;
- padding: 2px 0px 2px 20px;
-}
-
-#navbar a.parent
-{
- margin-left: 0px;
-}
-
-ul#navbar li a.current span
-{
- background: #3f6ad1;
- color: #fff;
-}
-ul#navbar li li
-{
- padding-left: 20px;
-}
-
-#navbar li.collapsed ul
-{
- display: none;
-}
-
-#navbar img.collapsed
-{
- background: url(../images/collapsed.png) no-repeat center center;
-}
-
-#navbar img.collapsed:hover
-{
- background-image: url(../images/collapsed-hover.png);
-}
-
-#navbar img.expanded
-{
-
- background: url(../images/expanded.png) no-repeat center center;
-}
-
-#navbar img.expanded:hover
-{
- background-image: url(../images/expanded-hover.png);
-}
-
-
-/*
Reset headings which get reset by YUI! - based on firefox 2 html.css
*/
@@ -350,45 +157,6 @@
Menu layout ("navbar" conflicts with the template "simple" - testing -
try the admin section)
*/
-ul#menu
-{
- /*background: #fff;*/
-}
-
-ul#menu li
-{
- display: block;
- white-space: nowrap;
-}
-
-ul#menu li a
-{
- color: #000;
- text-decoration: none;
- background-repeat: no-repeat;
- background-position: left center;
- display: inline-block;
- padding-left: 20px;
- margin-left: 0px;
- padding: 2px 0px 2px 0px;
-}
-
-#menu a.parent
-{
- margin-left: 0px;
-}
-
-ul#menu li a.current span
-{
- background: #3f6ad1;
- color: #fff;
-}
-
-ul#menu li li
-{
- padding-left: 20px;
-}
-
.yui-skin-sam .yui-navset .yui-nav li.disabled
{
opacity: .5;
@@ -455,34 +223,8 @@
margin: 1em 0 1em 1em;
}
-ul {
- padding: 0;
- padding-bottom: 20px; /* give whitespace at bottom for FF */
- margin: 0;
- list-style-type: square;
- }
- li {
- padding: 0;
- margin: 0;
- margin: 0.5ex 0 0.5ex 1.2em;
- }
-table {
- border-color: #666;
- }
- th {
- background-color: #EEE;
- padding: 4px 7px 5px;
- border-color: #666;
- text-align: left;
- }
- td {
- padding: 2px 7px 3px;
- border-color: #666 #CCC;
- vertical-align: top;
- }
-
/*
* COMMON LAYOUT PANE FORMATTING
*/
@@ -544,30 +286,8 @@
}
-/*
-* INNER-LAYOUT PANE FORMATTING
-*/
-#mainContent .ui-layout-pane {
- padding: 10px;
-}
-#mainContent .ui-layout-north ,
-#mainContent .ui-layout-south {
- text-align: center;
-}
-#mainContent .ui-layout-center {
- padding: 0 !important; /* inner divs have padding */
-}
-#mainContent .ui-layout-content {
- padding: 10px;
-}
-#mainContent .ui-layout-center h3 {
- font-size: 1em;
- padding: 5px;
- margin: 0;
-}
-
/*
* OUTER LAYOUT RESIZERS & TOGGLERS
*/
Modified: branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
2015-11-27 00:29:08 UTC (rev 14493)
+++ branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
2015-11-27 11:09:35 UTC (rev 14494)
@@ -41,14 +41,14 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/examples/treeview/assets/css/folders/tree.css');
phpgwapi_yui::load_widget('treeview');
phpgwapi_yui::load_widget('datasource');
-
$GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'] =
'ajax_menu';
+
$GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'] =
'jsmenu';
if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'])
&& $GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'] ==
'ajax_menu')
{
$javascripts[] =
"/phpgwapi/templates/portico/js/menu.js";
}
else if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'])
&& $GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'] ==
'jsmenu')
{
- phpgwapi_jquery::load_widget('menu');
+ phpgwapi_jquery::load_widget('treeview');
}
}
Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
2015-11-27 00:29:08 UTC (rev 14493)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.inc.php
2015-11-27 11:09:35 UTC (rev 14494)
@@ -186,8 +186,21 @@
$var['treemenu'] .= <<<JS
<script type="text/javascript">
$(function() {
- $("#navbar").menu();
- });
+ $('#navbar').jstree({
+ core:{
+ multiple: false
+ },
+ plugins: ["state", "search"]
+ });
+ var to = false;
+ $('#plugins4_q').keyup(function () {
+ if(to) { clearTimeout(to); }
+ to = setTimeout(function () {
+ var v =
$('#plugins4_q').val();
+
$('#navbar').jstree(true).search(v);
+ }, 250);
+ });
+ });
</script>
JS;
Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
2015-11-27 00:29:08 UTC (rev 14493)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
2015-11-27 11:09:35 UTC (rev 14494)
@@ -49,14 +49,13 @@
</div>
<div class="ui-layout-west">
- <div class="content">
+ <div>
<h2>{user_fullname}</h2>
</div>
- <div class="body">
- <div class="treeview">
+ <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">
{treemenu}
- </div>
</div>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14494] test new portico-layout,
Sigurd Nes <=