[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14449] fix xslt transformation
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14449] fix xslt transformation |
|
Date: |
Sat, 21 Nov 2015 21:10:17 +0000 |
Revision: 14449
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14449
Author: sigurdne
Date: 2015-11-21 21:10:16 +0000 (Sat, 21 Nov 2015)
Log Message:
-----------
fix xslt transformation
Modified Paths:
--------------
branches/dev-syncromind/frontend/inc/class.uicontract.inc.php
branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
branches/dev-syncromind/frontend/inc/class.uicontroller.inc.php
branches/dev-syncromind/frontend/inc/class.uidelegates.inc.php
branches/dev-syncromind/frontend/inc/class.uidocumentupload.inc.php
branches/dev-syncromind/frontend/inc/class.uidrawings.inc.php
branches/dev-syncromind/frontend/inc/class.uientity.inc.php
branches/dev-syncromind/frontend/inc/class.uihelpdesk.inc.php
branches/dev-syncromind/frontend/inc/class.uimaintenance.inc.php
branches/dev-syncromind/frontend/inc/class.uimessages.inc.php
branches/dev-syncromind/frontend/inc/class.uipictures.inc.php
branches/dev-syncromind/frontend/inc/class.uirefurbishment.inc.php
branches/dev-syncromind/frontend/inc/class.uiservices.inc.php
branches/dev-syncromind/frontend/templates/base/contract.xsl
branches/dev-syncromind/frontend/templates/base/controller.xsl
branches/dev-syncromind/frontend/templates/base/delegate.xsl
branches/dev-syncromind/frontend/templates/base/document.xsl
branches/dev-syncromind/frontend/templates/base/documentupload.xsl
branches/dev-syncromind/frontend/templates/base/drawings.xsl
branches/dev-syncromind/frontend/templates/base/entity.xsl
branches/dev-syncromind/frontend/templates/base/entityview.xsl
branches/dev-syncromind/frontend/templates/base/frontend.xsl
branches/dev-syncromind/frontend/templates/base/helpdesk.xsl
branches/dev-syncromind/frontend/templates/base/maintenance.xsl
branches/dev-syncromind/frontend/templates/base/messages.xsl
branches/dev-syncromind/frontend/templates/base/pictures.xsl
branches/dev-syncromind/frontend/templates/base/refurbishment.xsl
branches/dev-syncromind/frontend/templates/base/services.xsl
branches/dev-syncromind/frontend/templates/base/ticketview.xsl
Modified: branches/dev-syncromind/frontend/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uicontract.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uicontract.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -178,7 +178,7 @@
$data = array (
'header' => $this->header_state,
- 'contract_data' => array (
+ 'section' => array (
'select' =>
$contracts_for_selection,
'selected_contract' =>
$this->contract_state['selected'],
'contract' =>
isset($this->contract_state['contract']) ?
$this->contract_state['contract']->serialize() : array(),
@@ -193,7 +193,7 @@
)
);
- self::render_template_xsl(array( 'contract', 'frontend'),
array('data' => $data));
+ self::render_template_xsl(array( 'contract',
'datatable_inline', 'frontend'), $data);
}
Modified:
branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uicontract_documents.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -187,7 +187,7 @@
$data = array
(
'header' =>
$this->header_state,
- 'contract_data' => array (
+ 'section' => array (
'datatable_def' =>
$datatable_def,
'tabs'
=> $this->tabs,
'tabs_content' =>
$this->tabs_content,
@@ -200,7 +200,7 @@
)
);
- self::render_template_xsl(array('document',
'datatable_inline', 'frontend'), array('data' => $data));
+ self::render_template_xsl(array('document',
'datatable_inline', 'frontend'), $data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/inc/class.uicontroller.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uicontroller.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uicontroller.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -112,13 +112,13 @@
$data = array
(
'header' =>$this->header_state,
- 'tabs' => $this->tabs,
- 'menu' => $this->menu,
- 'controller' => array('location_code'=>
$this->location_code)
+ 'section' =>array(
+ 'tabs' => $this->tabs,
+ 'menu' => $this->menu,
+ 'controller' =>
array('location_code'=> $this->location_code)
+ )
);
-
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('app_data' =>
$data));
-
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','controller'));
+ self::render_template_xsl(array( 'controller',
'datatable_inline', 'frontend'), $data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/inc/class.uidelegates.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uidelegates.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uidelegates.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -185,8 +185,8 @@
phpgwapi_cache::session_clear('frontend','msgbox');
$data = array (
- 'header' =>
$this->header_state,
- 'delegate_data' => array (
+ 'header'
=> $this->header_state,
+ 'section'
=> array(
'form_action'
=> $form_action,
'tab_selected'
=> $this->tab_selected,
'delegate'
=> $delegates_per_org_unit,
@@ -202,7 +202,7 @@
)
);
- self::render_template_xsl(array( 'delegate',
'frontend'), array('data' => $data));
+ self::render_template_xsl(array( 'delegate',
'datatable_inline', 'frontend'),$data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/inc/class.uidocumentupload.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uidocumentupload.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uidocumentupload.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -17,7 +17,7 @@
public function __construct()
{
- //parent::__construct();
+ parent::__construct();
// This module uses XSLT templates
$GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"admin::frontend::documents";
@@ -42,17 +42,20 @@
$form_action =
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'frontend.uidocumentupload.index'));
$data = array (
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msgbox)),
- 'documentupload_data' => array(
- 'test' => $test2,
- 'filename' => $filename,
- 'storage' => $stored_in,
- 'success' => $success,
- 'file' => $_FILES["help_filename"],
- 'form_action' => $form_action)
+ 'header' =>
$this->header_state,
+ 'section' => array(
+ 'test' => $test2,
+ 'filename' => $filename,
+ 'storage' => $stored_in,
+ 'success' => $success,
+ 'file' =>
$_FILES["help_filename"],
+ 'form_action' => $form_action),
+ 'tab_selected' => $this->tab_selected,
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msgbox)),
+
);
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('app_data' =>
$data));
-
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','documentupload'));
+
+ self::render_template_xsl(array( 'documentupload',
'datatable_inline', 'frontend'), $data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/inc/class.uidrawings.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uidrawings.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uidrawings.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -118,10 +118,16 @@
$data = array
(
'header' =>
$this->header_state,
- 'drawings' =>
array('datatable_def'=>$datatable_def, 'tabs'=>$this->tabs,
'tabs_content'=>$this->tabs_content, 'tab_selected'=>$this->tab_selected,
'msgbox_data'=>$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog)))
+ 'section' => array(
+ 'datatable_def'=>$datatable_def,
+ 'tabs'=>$this->tabs,
+ 'tabs_content'=>$this->tabs_content,
+ 'tab_selected'=>$this->tab_selected,
+
'msgbox_data'=>$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))
+ )
);
- self::render_template_xsl(array('drawings',
'datatable_inline', 'frontend'), array('data' => $data));
+ self::render_template_xsl(array('drawings',
'datatable_inline', 'frontend'), $data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/inc/class.uientity.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uientity.inc.php 2015-11-21
11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uientity.inc.php 2015-11-21
21:10:16 UTC (rev 14449)
@@ -478,12 +478,18 @@
$data = array(
'header' =>
$this->header_state,
- 'entity' =>
array('datatable_def' => $datatable_def, 'tabs' => $this->tabs, 'tabs_content'
=> $this->tabs_content, 'filters' => $filters, 'tab_selected' =>
$this->tab_selected, 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))),
+ 'section' => array(
+ 'datatable_def' => $datatable_def,
+ 'tabs' => $this->tabs,
+ 'tabs_content' => $this->tabs_content,
+ 'filters' => $filters,
+ 'tab_selected' => $this->tab_selected,
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))),
'lightbox_name' => lang('add ticket')
);
self::add_javascript('frontend', 'jquery',
'entity.list.js');
- self::render_template_xsl(array( 'entity',
'datatable_inline', 'frontend'), array('data' => $data));
+ self::render_template_xsl(array( 'entity',
'datatable_inline', 'frontend'), $data);
}
@@ -777,7 +783,7 @@
$data = array(
'header' => $this->header_state,
- 'entityinfo' => array
+ 'section' => array
(
'entitylist' =>
$GLOBALS['phpgw']->link('/index.php',
array
@@ -819,6 +825,6 @@
);
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view', 'files'),
PHPGW_SERVER_ROOT . '/property/templates/base');
- self::render_template_xsl(array('frontend',
'entityview', 'attributes_view'), array('data' => $data));
+ self::render_template_xsl(array('frontend',
'entityview', 'attributes_view'), $data);
}
}
Modified: branches/dev-syncromind/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uihelpdesk.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uihelpdesk.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -184,12 +184,19 @@
$data = array(
'header' => $this->header_state,
- 'helpdesk' =>
array('datatable_def' => $datatable_def, 'tabs' => $this->tabs, 'tabs_content'
=> $this->tabs_content, 'filters' => $filters, 'tab_selected' =>
$this->tab_selected, 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))),
+ 'section' => array(
+ 'datatable_def' => $datatable_def,
+ 'tabs' => $this->tabs,
+ 'tabs_content' => $this->tabs_content,
+ 'filters' => $filters,
+ 'tab_selected' => $this->tab_selected,
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))
+ ),
'lightbox_name' => lang('add ticket')
);
self::add_javascript('frontend', 'jquery',
'helpdesk.list.js');
- self::render_template_xsl(array('helpdesk',
'datatable_inline', 'frontend'), array('data' => $data));
+ self::render_template_xsl(array('helpdesk',
'datatable_inline', 'frontend'), $data);
}
public function query()
@@ -368,8 +375,7 @@
$data = array(
'header' => $this->header_state,
- 'msgbox_data' => isset($msglog) ?
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))
: array(),
- 'ticketinfo' => array(
+ 'section' => array(
'helpdesklist' =>
$GLOBALS['phpgw']->link('/index.php',
array
(
@@ -380,11 +386,12 @@
'tickethistory' => $tickethistory2,
'tabs' => $this->tabs,
'tabs_content' => $this->tabs_content,
- 'tab_selected' => $this->tab_selected
+ 'tab_selected' => $this->tab_selected,
+ 'msgbox_data' => isset($msglog) ?
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))
: array(),
)
);
- self::render_template_xsl(array('frontend',
'ticketview'), array('data' => $data));
+ self::render_template_xsl(array('frontend',
'datatable_inline', 'ticketview'), $data);
}
@@ -570,9 +577,13 @@
'custom_attributes' => array('attributes'
=> $item['attributes']),
);
-
/*$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','helpdesk','attributes_view'));
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('add_ticket' => $data));*/
+
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','helpdesk','attributes_view'));
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('add_ticket' => $data));
-
self::render_template_xsl(array('frontend','helpdesk','attributes_view'),
array('add_ticket' => $data));
+ /*
+ * Note: not working for when you want a spesific
target other than 'data'
+ *
self::render_template_xsl(array('frontend','helpdesk','attributes_view'),
array('add_ticket' => $data));
+ */
+
}
}
Modified: branches/dev-syncromind/frontend/inc/class.uimaintenance.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uimaintenance.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uimaintenance.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -50,12 +50,13 @@
$data = array
(
'header' =>$this->header_state,
- 'tabs' => $this->tabs,
- 'maintenance' => lang('not_implemented')
+ 'section' => array('maintenance' =>
lang('not_implemented'),
+ 'tabs' => $this->tabs,
+ 'tabs_content'=>$this->tabs_content,
+ 'tab_selected'=>$this->tab_selected
+ )
);
-
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('app_data' =>
$data));
-
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','maintenance'));
+ self::render_template_xsl(array('maintenance',
'datatable_inline', 'frontend'), $data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/inc/class.uimessages.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uimessages.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uimessages.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -47,7 +47,7 @@
$data = array (
'header' =>
$this->header_state,
- 'messages_data' => array (
+ 'section' => array (
'form_action' => $form_action,
'message' => $messages,
'view' => $message,
@@ -58,7 +58,7 @@
);
- self::render_template_xsl(array('messages',
'frontend'), array('data' => $data));
+ self::render_template_xsl(array('messages',
'datatable_inline', 'frontend'), $data);
}
Modified: branches/dev-syncromind/frontend/inc/class.uipictures.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uipictures.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uipictures.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -47,70 +47,17 @@
public function index()
{
- /*$allusers =
$GLOBALS['phpgw']->accounts->get_list('accounts', -1);
- $content = array();
- foreach ($allusers as $user)
- {
- $content[] = array
- (
- 'id' => $user->id,
- 'name' => $user->__toString(),
- );
- }
-
-
- $myColumnDefs[0] = array
- (
- 'name' => "0",
- 'values' => json_encode(array(
array('key' => 'id','label'=> lang('id')
,'sortable'=>true,'resizeable'=>true,'hidden'=>false),
-
array('key' => 'name', 'label'=> lang('name'),
'sortable'=>true,'resizeable'=>true),
-
array('key' => 'select','label'=> lang('select'),
'sortable'=>false,'resizeable'=>false,'formatter'=>'myFormatterCheck','width'=>30)))
- );
-
- $datavalues[0] = array
- (
- 'name'
=> "0",
- 'values'
=> json_encode($content),
- 'total_records' => 0,
- 'permission' => "''",
- 'is_paginator' => 1,
- 'footer'
=> 1
- );
-
-
$data = array
(
- 'header'
=>$this->header_state,
- 'td_count' => 2,
- 'base_java_url' =>
"{menuaction:'frontend.ui_demo_tabs.first'}",
- 'property_js' =>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
- 'datatable' => $datavalues,
- 'myColumnDefs' => $myColumnDefs,
- 'tabs' => $this->tabs,
- );
-
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('loader');
- phpgwapi_yui::load_widget('paginator');
-
-
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.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']->js->validate_file( 'yahoo',
'demo_tabs.second', 'frontend' );
-
- $GLOBALS['phpgw']->xslttpl->add_file(array('frontend', 'demo'));
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('demo_3' => $data));*/
- $data = array
- (
'header' =>$this->header_state,
- 'tabs' => $this->tabs,
- 'pictures' => lang('not_implemented')
+ 'section' => array('maintenance' =>
lang('not_implemented'),
+ 'tabs' => $this->tabs,
+ 'tabs_content'=>$this->tabs_content,
+ 'tab_selected'=>$this->tab_selected
+ )
);
+ self::render_template_xsl(array('pictures',
'datatable_inline', 'frontend'), $data);
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('app_data' =>
$data));
-
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','pictures'));
}
Modified: branches/dev-syncromind/frontend/inc/class.uirefurbishment.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uirefurbishment.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uirefurbishment.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -50,10 +50,14 @@
$data = array
(
'header' => $this->header_state,
- 'contract' => array('refurbishment' =>
lang('not_implemented'), 'tabs' => $this->tabs,
'tabs_content'=>$this->tabs_content, 'tab_selected'=>$this->tab_selected)
+ 'section' => array('refurbishment' =>
lang('not_implemented'),
+ 'tabs' => $this->tabs,
+ 'tabs_content'=>$this->tabs_content,
+ 'tab_selected'=>$this->tab_selected
+ )
);
- self::render_template_xsl(array('refurbishment',
'frontend'), array('data' => $data));
+ self::render_template_xsl(array('refurbishment',
'datatable_inline', 'frontend'), $data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/inc/class.uiservices.inc.php
===================================================================
--- branches/dev-syncromind/frontend/inc/class.uiservices.inc.php
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/inc/class.uiservices.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
@@ -49,13 +49,16 @@
{
$data = array
(
- 'header' =>$this->header_state,
- 'tabs' => $this->tabs,
- 'services' => lang('not_implemented')
+ 'header' =>$this->header_state,
+ 'section' => array(
+ 'services' =>
lang('not_implemented'),
+ 'tabs' => $this->tabs,
+ 'tabs_content' => $this->tabs_content,
+ 'tab_selected' => $this->tab_selected
+ )
);
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('app_data' =>
$data));
-
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','services'));
+ self::render_template_xsl(array('services',
'datatable_inline', 'frontend'), $data);
}
public function query() {}
Modified: branches/dev-syncromind/frontend/templates/base/contract.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/contract.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/contract.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="contract_data" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
Modified: branches/dev-syncromind/frontend/templates/base/controller.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/controller.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/controller.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="controller" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<div class="yui-content">
<xsl:variable name="controller_params">
Modified: branches/dev-syncromind/frontend/templates/base/delegate.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/delegate.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/delegate.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="delegate_data" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
<xsl:call-template name="msgbox"/>
Modified: branches/dev-syncromind/frontend/templates/base/document.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/document.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/document.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="contract_data" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
Modified: branches/dev-syncromind/frontend/templates/base/documentupload.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/documentupload.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/documentupload.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,20 +1,42 @@
-<xsl:template match="documentupload_data" xmlns:php="http://php.net/xsl";>
- <div class="yui-navset" id="ticket_tabview">
- <xsl:value-of disable-output-escaping="yes" select="tabs" />
- <div class="yui-content">
- <h3>Vi skal laste opp greier!</h3>
- <img
src="frontend/templates/base/images/32x32/page_white.png"
class="list_image"/><br/>
- file: <xsl:value-of select="file"/><br/>
- test: <xsl:value-of select="test"/><br/>
- fn: <xsl:value-of select="filename"/><br/>
- stored: <xsl:value-of select="storage"/><br/>
- success: <xsl:value-of select="success"/><br/>
- <form ENCTYPE="multipart/form-data" name="uploadform"
method="post" action="{form_action}">
- <dl>
- <dt><input type="file" name="help_filename"
id="help_filename"/></dt>
- <dt><input type="submit" value="Last opp"
name="file_upload"/></dt>
- </dl>
- </form>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <xsl:call-template name="msgbox"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <div class="frontend_body">
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <xsl:variable name="tab_selected">
+ <xsl:value-of select="tab_selected"/>
+ </xsl:variable>
+ <div id="{$tab_selected}">
+
+ <h3>Vi skal laste opp greier!</h3>
+ <img
src="frontend/templates/base/images/32x32/page_white.png" class="list_image"/>
+ <br/>
+ file: <xsl:value-of select="file"/>
+ <br/>
+ test: <xsl:value-of select="test"/>
+ <br/>
+ fn: <xsl:value-of select="filename"/>
+ <br/>
+ stored: <xsl:value-of select="storage"/>
+ <br/>
+ success: <xsl:value-of select="success"/>
+ <br/>
+ <form ENCTYPE="multipart/form-data"
name="uploadform" method="post" action="{form_action}">
+ <dl>
+ <dt>
+ <input type="file"
name="help_filename" id="help_filename"/>
+ </dt>
+ <dt>
+ <input type="submit"
value="Last opp" name="file_upload"/>
+ </dt>
+ </dl>
+ </form>
+ </div>
</div>
</div>
</xsl:template>
\ No newline at end of file
Modified: branches/dev-syncromind/frontend/templates/base/drawings.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/drawings.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/drawings.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,5 +1,5 @@
<!-- $Id$ -->
-<xsl:template match="drawings" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
Modified: branches/dev-syncromind/frontend/templates/base/entity.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/entity.xsl 2015-11-21
11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/entity.xsl 2015-11-21
21:10:16 UTC (rev 14449)
@@ -1,5 +1,5 @@
<!-- $Id$ -->
-<xsl:template match="entity" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
Modified: branches/dev-syncromind/frontend/templates/base/entityview.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/entityview.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/entityview.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="entityinfo" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<script type="text/javascript">
Modified: branches/dev-syncromind/frontend/templates/base/frontend.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/frontend.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/frontend.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,3 +1,11 @@
+
+<xsl:template match="data">
+ <xsl:apply-templates select="header"/>
+ <xsl:apply-templates select="section"/>
+ <xsl:call-template name="jquery_phpgw_i18n"/>
+</xsl:template>
+
+
<xsl:template match="header" xmlns:php="http://php.net/xsl";>
<xsl:variable name="messages_url"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:frontend.uimessages.index')" /></xsl:variable>
<div class="frontend_header">
Modified: branches/dev-syncromind/frontend/templates/base/helpdesk.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/helpdesk.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/helpdesk.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,5 +1,5 @@
<!-- $Id$ -->
-<xsl:template match="helpdesk" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
Modified: branches/dev-syncromind/frontend/templates/base/maintenance.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/maintenance.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/maintenance.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,8 +1,20 @@
-<xsl:template match="contract" xmlns:php="http://php.net/xsl";>
- <div class="yui-navset" id="ticket_tabview">
- <div class="yui-content">
- Kontraktsinformasjon
- </div>
- </div>
-</xsl:template>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="tab_selected"><xsl:value-of
select="tab_selected"/></xsl:variable>
+
+ <div class="frontend_body">
+ <div class="pure-form pure-form-aligned">
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <div id="{$tab_selected}">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <xsl:value-of
select="php:function('lang', 'not_implemented')"/>
+ </div>
+ </div>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs_content" />
+ </div>
+ </div>
+ </div>
+</xsl:template>
\ No newline at end of file
Modified: branches/dev-syncromind/frontend/templates/base/messages.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/messages.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/messages.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="messages_data" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:variable name="tab_selected"><xsl:value-of
select="tab_selected"/></xsl:variable>
Modified: branches/dev-syncromind/frontend/templates/base/pictures.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/pictures.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/pictures.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,8 +1,20 @@
-<xsl:template match="contract" xmlns:php="http://php.net/xsl";>
- <div class="yui-navset" id="ticket_tabview">
- <div class="yui-content">
- Kontraktsinformasjon
- </div>
- </div>
-</xsl:template>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="tab_selected"><xsl:value-of
select="tab_selected"/></xsl:variable>
+
+ <div class="frontend_body">
+ <div class="pure-form pure-form-aligned">
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <div id="{$tab_selected}">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <xsl:value-of
select="php:function('lang', 'not_implemented')"/>
+ </div>
+ </div>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs_content" />
+ </div>
+ </div>
+ </div>
+</xsl:template>
\ No newline at end of file
Modified: branches/dev-syncromind/frontend/templates/base/refurbishment.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/refurbishment.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/refurbishment.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="contract" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:variable name="tab_selected"><xsl:value-of
select="tab_selected"/></xsl:variable>
Modified: branches/dev-syncromind/frontend/templates/base/services.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/services.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/services.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,8 +1,20 @@
-<xsl:template match="contract" xmlns:php="http://php.net/xsl";>
- <div class="yui-navset" id="ticket_tabview">
- <div class="yui-content">
- Kontraktsinformasjon
- </div>
- </div>
-</xsl:template>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
+ <xsl:variable name="tab_selected"><xsl:value-of
select="tab_selected"/></xsl:variable>
+
+ <div class="frontend_body">
+ <div class="pure-form pure-form-aligned">
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes"
select="tabs" />
+ <div id="{$tab_selected}">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <xsl:value-of
select="php:function('lang', 'not_implemented')"/>
+ </div>
+ </div>
+ </div>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs_content" />
+ </div>
+ </div>
+ </div>
+</xsl:template>
\ No newline at end of file
Modified: branches/dev-syncromind/frontend/templates/base/ticketview.xsl
===================================================================
--- branches/dev-syncromind/frontend/templates/base/ticketview.xsl
2015-11-21 11:26:22 UTC (rev 14448)
+++ branches/dev-syncromind/frontend/templates/base/ticketview.xsl
2015-11-21 21:10:16 UTC (rev 14449)
@@ -1,4 +1,4 @@
-<xsl:template match="ticketinfo" xmlns:php="http://php.net/xsl";>
+<xsl:template match="section" xmlns:php="http://php.net/xsl";>
<xsl:choose>
<xsl:when test="msgbox_data != ''">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14449] fix xslt transformation,
Sigurd Nes <=