[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13040] convert uiinvoice2
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13040] convert uiinvoice2 |
|
Date: |
Mon, 20 Apr 2015 12:23:23 +0000 |
Revision: 13040
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13040
Author: sigurdne
Date: 2015-04-20 12:23:23 +0000 (Mon, 20 Apr 2015)
Log Message:
-----------
convert uiinvoice2
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
branches/dev-syncromind/phpgwapi/templates/pure/head.tpl
branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
branches/dev-syncromind/property/js/portico/ajax_invoice.js
branches/dev-syncromind/property/templates/base/invoice2.xsl
Added Paths:
-----------
branches/dev-syncromind/phpgwapi/templates/pure/css/global.css
branches/dev-syncromind/property/js/portico/invoice2.index.js
Added: branches/dev-syncromind/phpgwapi/templates/pure/css/global.css
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/css/global.css
(rev 0)
+++ branches/dev-syncromind/phpgwapi/templates/pure/css/global.css
2015-04-20 12:23:23 UTC (rev 13040)
@@ -0,0 +1,41 @@
+/*
+ Error Related CSS
+*/
+.error
+{
+ background-color: #fcc;
+ border: 1px solid #f00;
+ color: #f00;
+}
+
+.msg
+{
+ background-color: #FFA500;
+ border: 1px solid #f00;
+ color: #f00;
+ text-align: center;
+}
+
+.msg_good
+{
+ background-color: #99FF66;
+ border: 1px solid #00CC00;
+ font-weight: bold;
+ text-align: center;
+}
+
+.warn
+{
+ background-color: #ff8;
+ border: 1px solid #fc0;
+ color: #fc0;
+}
+
+div.error, div.warn
+{
+ font-weight: bold;
+ padding: 2px;
+ text-align: center;
+}
+
+
Modified: branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
2015-04-20 12:22:43 UTC (rev 13039)
+++ branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
2015-04-20 12:23:23 UTC (rev 13040)
@@ -20,7 +20,18 @@
$javascripts[] =
"/phpgwapi/js/yui3-gallery/gallery-sm-menu-templates/gallery-sm-menu-templates-min.js";
$javascripts[] =
"/phpgwapi/js/jquery/mmenu/src/js/jquery.mmenu.min.all.js";
$javascripts[] = "/phpgwapi/templates/pure/js/mmenu.js";
+
+ $stylesheets[] =
"/phpgwapi/js/jquery/mmenu/src/css/jquery.mmenu.all.css";
+
+ $menu_stylesheet_widescreen = <<<HTML
+
+ <link
href="{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/jquery/mmenu/src/css/extensions/jquery.mmenu.widescreen.css"
type="text/css" rel="stylesheet" media="all and (min-width: 1430px)" />
+HTML;
}
+ else
+ {
+ $menu_stylesheet_widescreen = '';
+ }
if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
{
@@ -35,11 +46,11 @@
$GLOBALS['phpgw']->template->set_block('head', 'stylesheet',
'stylesheets');
$GLOBALS['phpgw']->template->set_block('head', 'javascript',
'javascripts');
+ $stylesheets[] = "/phpgwapi/templates/pure/css/global.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";
- $stylesheets[] =
"/phpgwapi/js/jquery/mmenu/src/css/jquery.mmenu.all.css";
// $stylesheets[] = "/phpgwapi/templates/pure/css/side-menu.css";
// $stylesheets[] = "/phpgwapi/templates/pure/css/baby-blue.css";
@@ -78,19 +89,19 @@
$GLOBALS['phpgw']->template->parse('javascripts',
'javascript', true);
}
}
-
$tpl_vars = array
(
- 'noheader' =>
isset($GLOBALS['phpgw_info']['flags']['noheader_xsl']) &&
$GLOBALS['phpgw_info']['flags']['noheader_xsl'] ? 'true' : 'false',
- 'nofooter' =>
isset($GLOBALS['phpgw_info']['flags']['nofooter']) &&
$GLOBALS['phpgw_info']['flags']['nofooter'] ? 'true' : 'false',
- 'css' =>
$GLOBALS['phpgw']->common->get_css(),
- 'javascript' =>
$GLOBALS['phpgw']->common->get_javascript(),
- 'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
- 'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
- 'browser_not_supported' => lang('browser not supported'),
- 'str_base_url' => $GLOBALS['phpgw']->link('/',
array(), true),
- 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
- 'win_on_events' =>
$GLOBALS['phpgw']->common->get_on_events(),
+ 'noheader' =>
isset($GLOBALS['phpgw_info']['flags']['noheader_xsl']) &&
$GLOBALS['phpgw_info']['flags']['noheader_xsl'] ? 'true' : 'false',
+ 'nofooter' =>
isset($GLOBALS['phpgw_info']['flags']['nofooter']) &&
$GLOBALS['phpgw_info']['flags']['nofooter'] ? 'true' : 'false',
+ 'css' =>
$GLOBALS['phpgw']->common->get_css(),
+ 'javascript' =>
$GLOBALS['phpgw']->common->get_javascript(),
+ 'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
+ 'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
+ 'browser_not_supported' => lang('browser not
supported'),
+ 'str_base_url' =>
$GLOBALS['phpgw']->link('/', array(), true),
+ 'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
+ 'win_on_events' =>
$GLOBALS['phpgw']->common->get_on_events(),
+ 'menu_stylesheet_widescreen'=> $menu_stylesheet_widescreen,
);
$GLOBALS['phpgw']->template->set_var($tpl_vars);
Modified: branches/dev-syncromind/phpgwapi/templates/pure/head.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/head.tpl 2015-04-20
12:22:43 UTC (rev 13039)
+++ branches/dev-syncromind/phpgwapi/templates/pure/head.tpl 2015-04-20
12:23:23 UTC (rev 13040)
@@ -19,10 +19,9 @@
<!-- BEGIN stylesheet -->
<link href="{stylesheet_uri}" type="text/css" rel="StyleSheet">
<!-- END stylesheet -->
- <link
href="{webserver_url}/phpgwapi/js/jquery/mmenu/src/css/extensions/jquery.mmenu.widescreen.css"
type="text/css" rel="stylesheet" media="all and (min-width: 1430px)" />
+ {menu_stylesheet_widescreen}
-
<style>
.priority1
{
Modified: branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
2015-04-20 12:22:43 UTC (rev 13039)
+++ branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
2015-04-20 12:23:23 UTC (rev 13040)
@@ -26,14 +26,14 @@
* @version $Id$
*/
- phpgw::import_class('phpgwapi.yui');
/**
* Import the jQuery class
*/
phpgw::import_class('phpgwapi.jquery');
+ phpgw::import_class('phpgwapi.uicommon_jquery');
- class property_uiinvoice2
+ class property_uiinvoice2 extends phpgwapi_uicommon_jquery
{
var $cat_id;
var $start;
@@ -63,7 +63,7 @@
function __construct()
{
-// parent::__construct();
+ parent::__construct();
$GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
$this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
@@ -77,55 +77,14 @@
$this->status_id =
$this->bo->status_id;
$this->allrows =
$this->bo->allrows;
-// self::set_active_menu('property::invoice::invoice2');
- $GLOBALS['phpgw_info']['flags']['menu_selection'] =
'property::invoice::invoice2';
+ self::set_active_menu('property::invoice::invoice');
+// $GLOBALS['phpgw_info']['flags']['menu_selection'] =
'property::invoice::invoice2';
$this->config =
CreateObject('phpgwapi.config','property');
$this->config->read();
}
- public function add_javascript($app, $pkg, $name)
- {
- return $GLOBALS['phpgw']->js->validate_file($pkg,
str_replace('.js', '', $name), $app);
- }
/**
- * A more flexible version of xslttemplate.add_file
- */
- public function add_template_file($tmpl)
- {
- if(is_array($tmpl))
- {
- foreach($tmpl as $t)
- {
- $this->add_template_file($t);
- }
- return;
- }
- foreach(array_reverse($this->tmpl_search_path) as $path)
- {
- $filename = $path . '/' . $tmpl . '.xsl';
- if (file_exists($filename))
- {
-
$GLOBALS['phpgw']->xslttpl->xslfiles[$tmpl] = $filename;
- return;
- }
- }
- echo "Template $tmpl not found in search path: ";
- print_r($this->tmpl_search_path);
- die;
- }
-
- public function link($data)
- {
- return $GLOBALS['phpgw']->link('/index.php', $data);
- }
-
- public function redirect($link_data)
- {
- $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
- }
-
- /**
* Reassign and alter dimensions accordingly
* @param int $line_id
* @param bigint $order_id
@@ -462,21 +421,6 @@
$user = $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] );
- $myColumnDefs = array();
- $datavalues = array();
- $myButtons = array();
-
- $datavalues[] = array
- (
- 'name' => "0",
- 'values' =>
$this->query(),//json_encode(array()),
- 'total_records' => 0,
- 'permission' => "''",
- 'is_paginator' => 1,
- 'edit_action' => "''",
- 'footer' => 0
- );
-
$datatable = array
(
array
@@ -489,20 +433,20 @@
'key' => 'approve_line',
'label' => lang('select'),
'sortable' => false,
- 'formatter' => 'FormatterCenter',
+ 'formatter' =>
'JqueryPortico.FormatterCenter',
),
array
(
'key' => 'status_line',
'label' => lang('status'),
'sortable' => false,
- 'formatter' => 'FormatterCenter',
+ 'formatter' =>
'JqueryPortico.FormatterCenter',
),
array
(
'key' => 'amount',
'label' => lang('amount'),
- 'formatter' => 'FormatterRight',
+ 'formatter' =>
'JqueryPortico.FormatterRight',
'sortable' => true
),
array
@@ -510,63 +454,63 @@
'key' => 'approved_amount',
'label' => lang('approved amount'),
'sortable' => true,
- 'formatter' => 'FormatterRight',
+ 'formatter' =>
'JqueryPortico.FormatterRight',
),
array
(
'key' => 'split',
'label' => lang('split line'),
'sortable' => false,
- 'formatter' => 'FormatterCenter',
+ 'formatter' =>
'JqueryPortico.FormatterCenter',
),
array
(
'key' => 'budget_account',
'label' => lang('budget account'),
'sortable' => false,
- 'formatter' => 'FormatterCenter',
+ 'formatter' =>
'JqueryPortico.FormatterCenter',
),
array
(
'key' => 'dima',
'label' => lang('dim a'),
'sortable' => false,
- 'formatter' => 'FormatterCenter',
+ 'formatter' =>
'JqueryPortico.FormatterCenter',
),
array
(
'key' => 'dimb',
'label' => lang('dim b'),
'sortable' => false,
- 'formatter' => 'FormatterCenter',
+ 'formatter' =>
'JqueryPortico.FormatterCenter',
),
array
(
'key' => 'order_id',
'label' => lang('order'),
'sortable' => false,
- 'formatter' => 'FormatterRight',
+ 'formatter' =>
'JqueryPortico.FormatterRight',
),
array
(
'key' => 'dime',
'label' => lang('dime'),
'sortable' => false,
- 'formatter' => 'FormatterRight',
+ 'formatter' =>
'JqueryPortico.FormatterRight',
),
array
(
'key' => 'project_group',
'label' => lang('project group'),
'sortable' => false,
- 'formatter' => 'FormatterRight',
+ 'formatter' =>
'JqueryPortico.FormatterRight',
),
array
(
'key' => 'line_text',
'label' => lang('invoice line text'),
'sortable' => false,
- 'formatter' => 'FormatterCenter',
+ 'formatter' =>
'JqueryPortico.FormatterCenter',
),
array
(
@@ -575,11 +519,18 @@
)
);
- $myColumnDefs[0] = array
+
+ $datatable_def = array();
+ $datatable_def[] = array
(
- 'name' => "0",
- 'values' => json_encode($datatable)
- );
+ 'container' =>
'datatable-container_1',
+ 'requestUrl' => "''",
+ 'ColumnDefs' => $datatable,
+ 'config' => array(
+ array('disableFilter' => true),
+ // array('disablePagination' => false)
+ )
+ );
$criteria_list = array
(
@@ -617,13 +568,8 @@
$data = array
(
- 'td_count'
=> '""',
- 'base_java_url'
=> "{menuaction:'property.uiinvoice2.query'}",
- 'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+ 'datatable_def'
=> $datatable_def,
'email_base_url'
=> json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uiinvoice2.index'),true,true)),
- 'datatable'
=> $datavalues,
- 'myColumnDefs'
=> $myColumnDefs,
- 'myButtons'
=> $myButtons,
'msgbox_data'
=> $msgbox_data,
'invoice_layout_config' =>
json_encode(execMethod('phpgwapi.template_portico.retrieve_local',
'invoice_layout_config')),
@@ -660,24 +606,22 @@
$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_yui::load_widget('layout');
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('menu');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('loader');
- phpgwapi_yui::load_widget('tabview');
- phpgwapi_yui::load_widget('paginator');
- phpgwapi_yui::load_widget('animation');
-
phpgwapi_jquery::load_widget('core');
+ phpgwapi_jquery::load_widget('layout');
+ phpgwapi_jquery::load_widget('numberformat');
self::add_javascript('property', 'portico',
'ajax_invoice.js');
- self::add_javascript('property', 'yahoo',
'invoice2.index.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-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']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
- $GLOBALS['phpgw']->xslttpl->add_file(array('invoice2'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice2','datatable_inline'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('data' => $data));
}
@@ -685,6 +629,8 @@
public function query()
{
$line_id = phpgw::get_var('line_id', 'int');
+ $draw = phpgw::get_var('draw', 'int'.'REQUEST', 0);
+
if ( ! $voucher_id =
phpgw::get_var('voucher_id_filter') )
{
$voucher_id = phpgw::get_var('voucher_id');
@@ -712,8 +658,11 @@
$results['results'][]= $entry;
}
+ $results['total_records'] = count($values);
- return json_encode($values);
+ $results['draw'] = $draw;
+
+ return $this->jquery_results($results);
}
public function get_vouchers()
Modified: branches/dev-syncromind/property/js/portico/ajax_invoice.js
===================================================================
--- branches/dev-syncromind/property/js/portico/ajax_invoice.js 2015-04-20
12:22:43 UTC (rev 13039)
+++ branches/dev-syncromind/property/js/portico/ajax_invoice.js 2015-04-20
12:23:23 UTC (rev 13040)
@@ -78,9 +78,9 @@
if( data != null)
{
line_id = data['line_id'];
- base_java_url['line_id'] = line_id;
- base_java_url['voucher_id_filter'] =
voucher_id;
- execute_async(myDataTable_0);
+ var oArgs_table =
{menuaction:'property.uiinvoice2.query',line_id: line_id, voucher_id_filter:
voucher_id};
+ var requestUrl_table =
phpGWLink('index.php', oArgs_table, true);
+
JqueryPortico.updateinlineTableHelper('datatable-container_1',
requestUrl_table);
update_form_values(line_id, 0);
}
}
@@ -211,9 +211,10 @@
{
$(submitBnt).val("Lagret");
-
base_java_url['voucher_id_filter'] = $("#voucher_id").val();
- base_java_url['line_id'] =
line_id;
- execute_async(myDataTable_0);
+ var oArgs_table =
{menuaction:'property.uiinvoice2.query',line_id: line_id, voucher_id_filter:
$("#voucher_id").val()};
+ var requestUrl_table =
phpGWLink('index.php', oArgs_table, true);
+
JqueryPortico.updateinlineTableHelper('datatable-container_1',
requestUrl_table);
+
}
else
{
@@ -691,9 +692,10 @@
if( data != null)
{
line_id = data['line_id'];
- base_java_url['line_id'] = line_id;
- base_java_url['voucher_id_filter'] = voucher_id;
- execute_async(myDataTable_0);
+ var oArgs_table =
{menuaction:'property.uiinvoice2.query',line_id: line_id, voucher_id_filter:
voucher_id};
+ var requestUrl_table = phpGWLink('index.php',
oArgs_table, true);
+
JqueryPortico.updateinlineTableHelper('datatable-container_1',
requestUrl_table);
+
update_form_values(line_id, 0);
}
}
Added: branches/dev-syncromind/property/js/portico/invoice2.index.js
===================================================================
--- branches/dev-syncromind/property/js/portico/invoice2.index.js
(rev 0)
+++ branches/dev-syncromind/property/js/portico/invoice2.index.js
2015-04-20 12:23:23 UTC (rev 13040)
@@ -0,0 +1,84 @@
+$(document).ready(function(){
+
+ $("body").layout(
+ {
+ applyDemoStyles: true,
+ east__size: 350,
+ east__fxSpeed: 100,
+ livePaneResizing: true,
+ animatePaneSizing: true, //
changes in pane-sizes when resetting state will be animated
+ stateManagement__enabled: true
+ });
+
+
+
+
+ var api = oTable0.api();
+ api.on( 'draw', sum_columns );
+
+});
+
+
+ function sum_columns()
+ {
+ var api = oTable0.api();
+ var data = api.ajax.json().data;
+ var amount = 0;
+ var approved_amount = 0;
+ var intVal = function ( i )
+ {
+ return typeof i === 'string' ?
+ i.replace(/[\$,]/g, '')*1 :
+ typeof i === 'number' ?
+ i : 0;
+ };
+
+ for ( var i=0 ; i < data.length ; i++ )
+ {
+ amount += intVal(data[i]['amount']);
+ approved_amount +=
intVal(data[i]['approved_amount_hidden']);
+ }
+ amount = $.number( amount, 2, ',', '' );
+ approved_amount = $.number( approved_amount, 2, ',', '' );
+ $(api.column(0).footer()).html("Sum:");
+ $(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-04-20 12:22:43 UTC (rev 13039)
+++ branches/dev-syncromind/property/templates/base/invoice2.xsl
2015-04-20 12:23:23 UTC (rev 13040)
@@ -1,22 +1,5 @@
<!-- $Id$ -->
-<func:function name="phpgw:conditional">
- <xsl:param name="test"/>
- <xsl:param name="true"/>
- <xsl:param name="false"/>
-
- <func:result>
- <xsl:choose>
- <xsl:when test="$test">
- <xsl:value-of select="$true"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$false"/>
- </xsl:otherwise>
- </xsl:choose>
- </func:result>
-</func:function>
-
<!-- separate tabs and inline tables-->
@@ -61,35 +44,40 @@
</script>
-->
<script type="text/javascript">
- var invoice_layout_config = <xsl:value-of
select="invoice_layout_config"/>;
+ var email_base_url = <xsl:value-of
select="//email_base_url"/>;
</script>
-
- <!-- IMPORTANT!!! Loads YUI javascript -->
-<!-- <xsl:call-template name="common"/> -->
-
- <div class="yui-content">
- <div id="invoice-layout">
- <div class="layout-north">
- <div class="body">
- <h2 class="icon"><xsl:value-of
select="site_title"/></h2>
- <div class="button-bar">
- <a href="{home_url}"
class="icon icon-home">
- <xsl:value-of
select="home_text"/>
- </a>
- <a href="{about_url}"
class="icon icon-about">
- <xsl:value-of
select="about_text"/>
- </a>
- <a
href="{preferences_url}" class="icon icon-preferences">
- <xsl:value-of
select="preferences_text"/>
- </a>
- <a href="{logout_url}"
class="icon icon-logout">
- <xsl:value-of
select="logout_text"/>
- </a>
- </div>
- </div>
+ <!--div class="ui-layout-north">
+ <div id="horizontal-menu">
+ <ul id="std-menu-items">
+ <li>
+ <a href="#">Nes,
Sigurd</a>
+ <ul>
+ <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>
+ </li>
+ </ul>
</div>
-
- <div class="layout-center">
+ </div-->
+ <div class="ui-layout-center">
<div class="header">
<h2><xsl:value-of
select="php:function('lang', 'invoice')"/></h2>
</div>
@@ -109,8 +97,18 @@
<table align = "center"
width="95%">
<tr>
<td
colspan = '6'>
-
<xsl:apply-templates select="paging"/>
-
<xsl:apply-templates select="datatable"/>
+
<xsl:for-each select="datatable_def">
+
<xsl:if test="container = 'datatable-container_1'">
+
<xsl:call-template name="table_setup">
+
<xsl:with-param name="container" select ='container'/>
+
<xsl:with-param name="requestUrl" select ='requestUrl'
/>
+
<xsl:with-param name="ColumnDefs" select ='ColumnDefs'
/>
+
<xsl:with-param name="tabletools" select ='tabletools'
/>
+
<xsl:with-param name="config" select ='config' />
+
</xsl:call-template>
+
</xsl:if>
+
</xsl:for-each>
+
<div id="receipt"></div>
</td>
</tr>
<tr>
@@ -132,7 +130,7 @@
</div>
</div>
</div>
- <div class="layout-east">
+ <div class="ui-layout-east">
<div class="header">
<h2>Bilde</h2>
</div>
@@ -149,17 +147,6 @@
</div>
</div>
</div>
- </div>
-
- <table>
- <tr>
- <td>
- </td>
- <td>
- </td>
- </tr>
- </table>
- </div>
</xsl:template>
<xsl:template match="filter_form" xmlns:php="http://php.net/xsl";>
@@ -570,52 +557,6 @@
</tr>
</xsl:template>
-
-<xsl:template match="datatable" xmlns:php="http://php.net/xsl";>
- <div id="paging_0"/>
- <div id="datatable-container_0"/>
-
- <div id="data_paginator"/>
- <div id="datatable-container"/>
-
- <xsl:call-template name="datasource-definition" />
- <div id="receipt"></div>
-</xsl:template>
-
-<xsl:template name="datasource-definition" xmlns:php="http://php.net/xsl";>
-
- <!-- DATATABLE DEFINITIONS-->
- <script type="text/javascript">
- var email_base_url = <xsl:value-of
select="//email_base_url"/>;
- var property_js = <xsl:value-of
select="//property_js"/>;
- var base_java_url = <xsl:value-of
select="//base_java_url"/>;
- var datatable = new Array();
- var myColumnDefs = new Array();
- var myButtons = new Array();
- var td_count = <xsl:value-of select="//td_count"/>;
-
- <xsl:for-each select="//datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- edit_action: <xsl:value-of
select="edit_action"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
- <xsl:for-each select="//myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- <xsl:for-each select="//myButtons">
- myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- </script>
-
-
-</xsl:template>
-
<!-- options for use with select-->
<xsl:template match="options">
<option value="{id}">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13040] convert uiinvoice2,
Sigurd Nes <=