[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14532] more on layout
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14532] more on layout |
|
Date: |
Sun, 06 Dec 2015 12:28:28 +0000 |
Revision: 14532
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14532
Author: sigurdne
Date: 2015-12-06 12:28:27 +0000 (Sun, 06 Dec 2015)
Log Message:
-----------
more on layout
Modified Paths:
--------------
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.tpl
branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
branches/dev-syncromind/property/js/portico/invoice2.index.js
branches/dev-syncromind/property/templates/base/invoice2.xsl
Modified: branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
2015-12-05 00:31:32 UTC (rev 14531)
+++ branches/dev-syncromind/phpgwapi/templates/portico/footer.tpl
2015-12-06 12:28:27 UTC (rev 14532)
@@ -1,8 +1,3 @@
- </div>
-
- <!--div class="ui-layout-east">
- <div class="header">Outer - East</div>
- </div-->
<div class="ui-layout-south">
<div class="body">
<div class="button-bar">
Modified: branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
2015-12-05 00:31:32 UTC (rev 14531)
+++ branches/dev-syncromind/phpgwapi/templates/portico/head.inc.php
2015-12-06 12:28:27 UTC (rev 14532)
@@ -149,10 +149,10 @@
flush();
- echo '<body>';
if( isset($GLOBALS['phpgw_info']['flags']['noframework']) )
{
+ echo '<body>';
register_shutdown_function('parse_footer_end_noframe');
}
Modified: branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
2015-12-05 00:31:32 UTC (rev 14531)
+++ branches/dev-syncromind/phpgwapi/templates/portico/js/base.js
2015-12-06 12:28:27 UTC (rev 14532)
@@ -23,6 +23,15 @@
, slideTrigger_open: "mouseover"
, initClosed: true
}
+ , east: {
+ initClosed: true
+ , initHidden: true
+ , spacing_closed: 0
+ // , closable: false
+ , resizable: true
+ , slidable: true
+
+ }
, south: {
maxSize: 200
, spacing_closed: 0
// HIDE resizer & toggler when 'closed'
@@ -34,6 +43,13 @@
});
+ pageLayout.hide("east");
+//
+// console.log(localStorage);
+// if (typeof(localStorage['pageLayout_west_closed']) !=
'undefined' && localStorage['pageLayout_west_closed'] == 1)
+// {
+// pageLayout.show("west");
+// }
/**
* Experimental : requires live update of js and css
Modified: branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
2015-12-05 00:31:32 UTC (rev 14531)
+++ branches/dev-syncromind/phpgwapi/templates/portico/navbar.tpl
2015-12-06 12:28:27 UTC (rev 14532)
@@ -62,6 +62,11 @@
{tree_script}
</div>
+ <div class="ui-layout-east">
+ <div id = "layouheader_east"
class="layouheader"></div>
+ <div id = "layoutcontent_east"></div>
+ </div>
+
<div id="center_content" class="ui-layout-center
content">
<h1 id="top">{current_app_title}</h1>
Modified: branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
2015-12-05 00:31:32 UTC (rev 14531)
+++ branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
2015-12-06 12:28:27 UTC (rev 14532)
@@ -562,8 +562,18 @@
'name' => lang('dimb'),
),
);
+ $version =
isset($GLOBALS['phpgw_info']['server']['versions']['system']) ?
$GLOBALS['phpgw_info']['server']['versions']['system'] :
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
- $data
= array
+
if(isset($GLOBALS['phpgw_info']['server']['system_name']))
+ {
+ $powered_by =
$GLOBALS['phpgw_info']['server']['system_name'] . ' ' . lang('version') . ' ' .
$version;
+ }
+ else
+ {
+ $powered_by = lang('Powered by phpGroupWare
version %1', $version);
+ }
+
+ $data = array
(
'datatable_def' => $datatable_def,
'email_base_url' =>
json_encode($GLOBALS['phpgw']->link('/index.php', array(
@@ -593,16 +603,17 @@
'voucher_list' => array('options' =>
$voucher_list),
),
'voucher_info' =>
$this->get_single_line($line_id),
- 'update_action' =>
self::link(array('menuaction' => 'property.uiinvoice2.update_voucher'))
+ 'update_action' =>
self::link(array('menuaction' => 'property.uiinvoice2.update_voucher')),
+ 'powered_by' => $powered_by
);
//_debug_array($data);die();
- $GLOBALS['phpgw_info']['flags']['noframework'] = true;
-
+// $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+/*
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/layout/assets/skins/sam/layout.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
-
+*/
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('layout');
phpgwapi_jquery::load_widget('numberformat');
@@ -610,12 +621,15 @@
self::add_javascript('property', 'portico',
'ajax_invoice.js');
self::add_javascript('property', 'portico',
'invoice2.index.js');
self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
- self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
+/* self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu/gallery-sm-menu-min.js');
self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu/gallery-sm-base-min.js');
self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu/gallery-sm-item-min.js');
self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu-templates/gallery-sm-menu-templates-min.js');
+*/
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('invoice');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice2',
'datatable_inline'));
Modified: branches/dev-syncromind/property/js/portico/invoice2.index.js
===================================================================
--- branches/dev-syncromind/property/js/portico/invoice2.index.js
2015-12-05 00:31:32 UTC (rev 14531)
+++ branches/dev-syncromind/property/js/portico/invoice2.index.js
2015-12-06 12:28:27 UTC (rev 14532)
@@ -1,24 +1,13 @@
-$(document).ready(function(){
-// $("body").layout(
-// {
-// applyDemoStyles: true,
-// east__size: 350,
-// east__fxSpeed: 100,
-// livePaneResizing: true,
-// animatePaneSizing: true,
-// stateManagement__enabled: true
-// });
+$(document).ready(function(){
-
-$(document).ready(function () {
- $('body').layout({ applyDemoStyles: true });
-});
-
var api = oTable0.api();
api.on( 'draw', sum_columns );
+ var image_iframe = '<iframe id="image_content" width="100%"
height="1000"><p>Your browser does not support iframes.</p></iframe>';
+ $("#layoutcontent_east").html(image_iframe);
+
});
@@ -47,41 +36,3 @@
$(api.column(2).footer()).html("<div
align=\"right\">"+amount+"</div>");
$(api.column(3).footer()).html("<div
align=\"right\">"+approved_amount+"</div>");
}
-
-var arURLParts = strBaseURL.split('?');
-var comboBase = arURLParts[0] + 'phpgwapi/inc/yui-combo-master/combo.php?';
-
-YUI_config = {
- //Don't combine the files
- combine: true,
- //Ignore things that are already loaded (in this process)
- ignoreRegistered: false,
- //Set the base path
- comboBase: comboBase,
- base: '',
- //And the root
- root: '',
- //Require your deps
- require: [ ]
-};
-
-
-//YUI({
-// classNamePrefix: 'pure'
-//}).use(
-// 'gallery-sm-menu',
-// function(Y) {
-// Y.on("domready", function () {
-// var horizontalMenu = new Y.Menu(
-// {
-// container :
'#horizontal-menu',
-// sourceNode :
'#std-menu-items',
-// orientation :
'horizontal',
-// hideOnOutsideClick:
false,
-// hideOnClick :
false
-// }
-// );
-// horizontalMenu.render();
-// horizontalMenu.show();
-// });
-//});
Modified: branches/dev-syncromind/property/templates/base/invoice2.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/invoice2.xsl
2015-12-05 00:31:32 UTC (rev 14531)
+++ branches/dev-syncromind/property/templates/base/invoice2.xsl
2015-12-06 12:28:27 UTC (rev 14532)
@@ -28,87 +28,30 @@
{
background-color: #DDF0FF;
}
-#navcontainer ul
-{
-margin: 0;
-padding: 0;
-list-style-type: none;
-text-align: right;
-}
-
-#navcontainer ul li { display: inline; }
-
-#navcontainer ul li a
-{
-text-decoration: none;
-padding: .2em 1em;
-color: #fff;
-background-color: #036;
-}
-
-#navcontainer ul li a:hover
-{
-color: #fff;
-background-color: #369;
-}
</style>
<xsl:call-template name="invoice" />
- <div id="popupBox"></div>
- <div id="curtain"></div>
</xsl:template>
<xsl:template name="invoice" xmlns:php="http://php.net/xsl";>
- <!-- loads translations into array for use with javascripts -->
- <!--
+
<script type="text/javascript">
+$(document).ready(function(){
+ pageLayout.open("east");
+ pageLayout.sizePane("east", 400);
+// pageLayout.hide("west");
+// localStorage['pageLayout_west_closed'] = 1;
+});
var lang = <xsl:value-of select="php:function('js_lang',
'edit')"/>;
</script>
- -->
<script type="text/javascript">
var email_base_url = <xsl:value-of
select="//email_base_url"/>;
</script>
- <div class="ui-layout-north">
- <div id="navcontainer">
- <ul>
- <li>
- <a href="#">
- <xsl:value-of
select="user_fullname"/>
- </a>
- </li>
- <li>
- <a href="{home_url}"
class="icon icon-home">
- <xsl:value-of
select="home_text"/>
- </a>
- </li>
- <!--li>
- <a href="{about_url}"
class="icon icon-about">
- <xsl:value-of
select="about_text"/>
- </a>
- </li>
- <li>
- <a
href="{preferences_url}" class="icon icon-preferences">
- <xsl:value-of
select="preferences_text"/>
- </a>
- </li-->
- <li>
- <a href="{logout_url}"
class="icon icon-logout">
- <xsl:value-of
select="logout_text"/>
- </a>
- </li>
- </ul>
- </div>
- </div>
- <div class="ui-layout-center">
- <div class="header">
- <h2><xsl:value-of
select="php:function('lang', 'invoice')"/></h2>
- </div>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
<xsl:call-template name="msgbox"/>
</xsl:when>
</xsl:choose>
- <div class="body">
<div id="voucher_details">
<!--<xsl:call-template
name="yui_phpgw_i18n"/>-->
<table align = "center"
width="95%" border="0">
@@ -150,25 +93,6 @@
</table>
</form>
</div>
- </div>
- </div>
- <div class="ui-layout-east">
- <div class="header">
- <h2>Bilde</h2>
- </div>
- <div class="body">
- <div id="image">
- <xsl:choose>
- <xsl:when
test="voucher_info/voucher/image_url != ''">
- <iframe
id="image_content" width="100%" height="1000" src =
"{voucher_info/voucher/image_url}" ><p>Your browser does not support
iframes.</p></iframe>
- </xsl:when>
- <xsl:otherwise>
- <iframe
id="image_content" width="100%" height="1000" ><p>Your browser does not support
iframes.</p></iframe>
- </xsl:otherwise>
- </xsl:choose>
- </div>
- </div>
- </div>
</xsl:template>
<xsl:template match="filter_form" xmlns:php="http://php.net/xsl";>
@@ -508,9 +432,9 @@
<xsl:template xmlns:php="http://php.net/xsl"; name="approve">
<xsl:apply-templates
select="voucher_info/generic/approved_list"/>
<tr class ='row_off'>
- <input id="sign_orig" type="hidden"
name="values[sign_orig]" value="{voucher_info/generic/sign_orig}"/>
- <input id="my_initials" type="hidden"
name="values[my_initials]" value="{voucher_info/generic/my_initials}"/>
<td class="th_text" align="left" valign="top"
style="white-space: nowrap;">
+ <input id="sign_orig" type="hidden"
name="values[sign_orig]" value="{voucher_info/generic/sign_orig}"/>
+ <input id="my_initials" type="hidden"
name="values[my_initials]" value="{voucher_info/generic/my_initials}"/>
<xsl:value-of select="php:function('lang',
'approve as')"/>
</td>
<td class="th_text" valign="top" align="left">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14532] more on layout,
Sigurd Nes <=