[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9613] controller: uicommon
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9613] controller: uicommon |
|
Date: |
Mon, 18 Jun 2012 13:41:02 +0000 |
Revision: 9613
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9613
Author: sigurdne
Date: 2012-06-18 13:41:01 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
controller: uicommon
Modified Paths:
--------------
trunk/controller/inc/class.uicommon.inc.php
trunk/controller/inc/class.uicontrol_location.inc.php
trunk/controller/js/controller/ajax_control_to_component.js
trunk/controller/js/yahoo/common.js
trunk/controller/js/yahoo/register_control_to_component2.js
trunk/controller/templates/base/add_component_to_control.xsl
trunk/controller/templates/base/add_component_to_control_group.xsl
trunk/controller/templates/base/component.xsl
trunk/controller/templates/base/control/control_tabs.xsl
trunk/controller/templates/base/control_group/control_group.xsl
trunk/controller/templates/base/control_group/control_group_items.xsl
trunk/controller/templates/base/control_item/control_item.xsl
trunk/controller/templates/base/control_item/control_item_option.xsl
trunk/controller/templates/base/control_location/register_control_to_component.xsl
trunk/controller/templates/base/control_location/register_control_to_location.xsl
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
trunk/controller/templates/base/css/base.css
trunk/controller/templates/base/datatable.xsl
trunk/controller/templates/base/procedure/procedure_item.xsl
trunk/controller/templates/base/procedure/procedure_tabs.xsl
trunk/controller/templates/base/view_component_for_control.xsl
trunk/controller/templates/base/view_component_for_control_group.xsl
trunk/registration/inc/class.uipending.inc.php
Modified: trunk/controller/inc/class.uicommon.inc.php
===================================================================
--- trunk/controller/inc/class.uicommon.inc.php 2012-06-18 13:39:24 UTC (rev
9612)
+++ trunk/controller/inc/class.uicommon.inc.php 2012-06-18 13:41:01 UTC (rev
9613)
@@ -394,11 +394,11 @@
public function add_yui_translation(&$data)
{
- $this->add_template_file('yui_booking_i18n');
+ $this->add_template_file('yui_phpgw_i18n');
$previous = lang('prev');
$next = lang('next');
- $data['yui_booking_i18n'] = array(
+ $data['yui_phpgw_i18n'] = array(
'Calendar' => array(
'WEEKDAYS_SHORT' =>
json_encode(lang_array('Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa')),
'WEEKDAYS_FULL' =>
json_encode(lang_array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday',
'Friday', 'Saturday')),
Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-18
13:39:24 UTC (rev 9612)
+++ trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-18
13:41:01 UTC (rev 9613)
@@ -4,6 +4,7 @@
*
* @author Erink Holm-Larsen <address@hidden>
* @author Torstein Vadla <address@hidden>
+ * @author Sigurd Nes <address@hidden>
* @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
* This file is part of phpGroupWare.
*
@@ -35,7 +36,7 @@
*/
phpgw::import_class('phpgwapi.jquery');
- phpgw::import_class('controller.uicommon');
+ phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('controller.socontrol_area');
include_class('controller', 'check_list', 'inc/model/');
@@ -43,7 +44,7 @@
include_class('controller', 'status_checker', 'inc/helper/');
include_class('controller', 'date_helper', 'inc/helper/');
- class controller_uicontrol_location extends controller_uicommon
+ class controller_uicontrol_location extends phpgwapi_uicommon
{
var $cat_id;
var $start;
@@ -673,14 +674,10 @@
$theme = 'ui-lightness';
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/development-bundle/themes/{$theme}/jquery.ui.autocomplete.css");
- phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
+
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_yui::load_widget('autocomplete');
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('autocomplete');
@@ -689,8 +686,7 @@
// self::add_javascript('controller', 'yahoo',
'register_control_to_component.js');
self::add_javascript('controller', 'yahoo',
'register_control_to_component2.js');
-
$GLOBALS['phpgw']->xslttpl->add_file(array('control_location/register_control_to_component'));
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('data' => $data));
+
self::render_template_xsl(array('control_location/register_control_to_component'
), $data);
}
Modified: trunk/controller/js/controller/ajax_control_to_component.js
===================================================================
--- trunk/controller/js/controller/ajax_control_to_component.js 2012-06-18
13:39:24 UTC (rev 9612)
+++ trunk/controller/js/controller/ajax_control_to_component.js 2012-06-18
13:41:01 UTC (rev 9613)
@@ -343,7 +343,7 @@
{
$(submitBnt).val("Lagret");
-
YAHOO.PORTICO.update_datatable();
+
YAHOO.portico.update_datatable();
}
else
{
@@ -469,7 +469,7 @@
function init_component_table()
{
var control_registered = 0;
- if (typeof($($("#control_registered")).attr("checked")) != 'udefined'
&& $($("#control_registered")).attr("checked") == 'checked')
+ if (typeof($($("#control_registered")).attr("checked")) != 'undefined'
&& $($("#control_registered")).attr("checked") == 'checked')
{
control_registered = 1;
}
@@ -509,7 +509,7 @@
};
var requestUrl = phpGWLink('index.php', oArgs, true);
- YAHOO.PORTICO.init_datatable(myColumnDefs,requestUrl);
+ YAHOO.portico.init_datatable(myColumnDefs,requestUrl);
}
@@ -517,7 +517,7 @@
{
var control_registered = 0;
- if (typeof($($("#control_registered")).attr("checked")) != 'udefined'
&& $($("#control_registered")).attr("checked") == 'checked')
+ if (typeof($($("#control_registered")).attr("checked")) != 'undefined'
&& $($("#control_registered")).attr("checked") == 'checked')
{
control_registered = 1;
}
@@ -552,7 +552,7 @@
var requestUrl = phpGWLink('index.php', oArgs, true);
- YAHOO.PORTICO.update_datatable(requestUrl);
+ YAHOO.portico.update_datatable(requestUrl);
}
// $("#receipt").html('');
}
Modified: trunk/controller/js/yahoo/common.js
===================================================================
--- trunk/controller/js/yahoo/common.js 2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/js/yahoo/common.js 2012-06-18 13:41:01 UTC (rev 9613)
@@ -8,7 +8,7 @@
YAHOO.portico.lang = function(section, config) {
config = config || {};
- if (YAHOO && YAHOO.booking && YAHOO.portico.i18n &&
YAHOO.portico.i18n[section]) {
+ if (YAHOO && YAHOO.portico && YAHOO.portico.i18n &&
YAHOO.portico.i18n[section]) {
YAHOO.portico.i18n[section](config);
}
return config;
Modified: trunk/controller/js/yahoo/register_control_to_component2.js
===================================================================
--- trunk/controller/js/yahoo/register_control_to_component2.js 2012-06-18
13:39:24 UTC (rev 9612)
+++ trunk/controller/js/yahoo/register_control_to_component2.js 2012-06-18
13:41:01 UTC (rev 9613)
@@ -1,13 +1,13 @@
-YAHOO.namespace ("PORTICO");
+YAHOO.namespace('portico');
-YAHOO.PORTICO.requestUrl = null;
-YAHOO.PORTICO.DataTable = null;
-YAHOO.PORTICO.Paginator = null;
+YAHOO.portico.requestUrl = null;
+YAHOO.portico.DataTable = null;
+YAHOO.portico.Paginator = null;
-YAHOO.PORTICO.update_datatable = function(requestUrl) {
+YAHOO.portico.update_datatable = function(requestUrl) {
- requestUrl = requestUrl ? requestUrl : YAHOO.PORTICO.requestUrl;
+ requestUrl = requestUrl ? requestUrl : YAHOO.portico.requestUrl;
var callback =
{
@@ -29,18 +29,18 @@
else
{
-
YAHOO.PORTICO.Paginator.setRowsPerPage(values_ds.recordsReturned,true);
+
YAHOO.portico.Paginator.setRowsPerPage(values_ds.recordsReturned,true);
//delete values of datatable
- YAHOO.PORTICO.DataTable.getRecordSet().reset();
+ YAHOO.portico.DataTable.getRecordSet().reset();
//reset total records always to zero
- YAHOO.PORTICO.Paginator.setTotalRecords(0,true);
+ YAHOO.portico.Paginator.setTotalRecords(0,true);
/*
//change PaginatorŽs configuration.
if(path_values.allrows == 1 )
{
-
YAHOO.PORTICO.Paginator.set("rowsPerPage",values_ds.totalRecords)
+
YAHOO.portico.Paginator.set("rowsPerPage",values_ds.totalRecords)
}
*/
//obtain records of the last DS and add to
datatable
@@ -49,29 +49,29 @@
if(record.length)
{
- YAHOO.PORTICO.DataTable.addRows(record);
+ YAHOO.portico.DataTable.addRows(record);
}
else
{
- YAHOO.PORTICO.DataTable.render();
+ YAHOO.portico.DataTable.render();
}
//update paginator with news values
-
YAHOO.PORTICO.Paginator.setTotalRecords(newTotalRecords,true);
+
YAHOO.portico.Paginator.setTotalRecords(newTotalRecords,true);
//update globals variables for pagination
myrowsPerPage = values_ds.recordsReturned;
mytotalRows = values_ds.totalRecords;
//update combo box pagination
-//
YAHOO.PORTICO.Paginator.set('rowsPerPageOptions',[myrowsPerPage,mytotalRows]);
+//
YAHOO.portico.Paginator.set('rowsPerPageOptions',[myrowsPerPage,mytotalRows]);
-
YAHOO.PORTICO.Paginator.setPage(values_ds.activePage,true); //true no fuerza un
recarge solo cambia el paginator
+
YAHOO.portico.Paginator.setPage(values_ds.activePage,true); //true no fuerza un
recarge solo cambia el paginator
//update "sortedBy" values
(values_ds.dir == "asc")? dir_ds =
YAHOO.widget.DataTable.CLASS_ASC : dir_ds = YAHOO.widget.DataTable.CLASS_DESC;
-
YAHOO.PORTICO.DataTable.set("sortedBy",{key:values_ds.sort,dir:dir_ds});
+
YAHOO.portico.DataTable.set("sortedBy",{key:values_ds.sort,dir:dir_ds});
}
},
failure: function(o) {window.alert('Server or your connection
is dead.')},
@@ -89,7 +89,7 @@
}
};
-YAHOO.PORTICO.init_datatable = function(myColumnDefs,requestUrl) {
+YAHOO.portico.init_datatable = function(myColumnDefs,requestUrl) {
fields = new Array();
for(i=0; i < myColumnDefs.length;i++)
@@ -127,26 +127,19 @@
"&results=" + results;
};
- myinitialPage = 1 //+ startIndex/myrowsPerPage;
-
myPaginatorConfig = {
- containers
: ['paging'],
-// totalRecords :
mytotalRows,
- initialPage :
myinitialPage,
- rowsPerPage
: 10,
-// alwaysVisible: true,
-// rowsPerPageOptions: [5, 10, 25,
50, 100, 200],
-// firstPageLinkLabel: "<<
first",
-// previousPageLinkLabel: "<
previous",
-// nextPageLinkLabel: "next >",
-// lastPageLinkLabel: "last
>>",
-// template
: "{RowsPerPageDropdown} elements_pr_page. {CurrentPageReport}<br/>
{FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink}",
- template
: "{CurrentPageReport}<br/> {FirstPageLink} {PreviousPageLink} {PageLinks}
{NextPageLink} {LastPageLink}",
- pageReportTemplate :
"shows_from {startRecord} to {endRecord} of_total {totalRecords}."
- }
+ containers : ['paging'],
+// alwaysVisible : true,
+// rowsPerPageOptions : [5, 10, 25, 50, 100, 200],
+ }
+
+ // from common.js
+ myPaginatorConfig = YAHOO.portico.lang('setupPaginator',
myPaginatorConfig);
+// myPaginatorConfig.template = "{RowsPerPageDropdown} elements_pr_page.
{CurrentPageReport}<br/> {FirstPageLink} {PreviousPageLink} {PageLinks}
{NextPageLink} {LastPageLink}";
+
myPaginator = new YAHOO.widget.Paginator(myPaginatorConfig);
- YAHOO.PORTICO.Paginator = myPaginator
+ YAHOO.portico.Paginator = myPaginator
// DataTable configuration
var myConfigs = {
@@ -161,14 +154,14 @@
var myDataTable = new YAHOO.widget.DataTable("datatable-container",
myColumnDefs, myDataSource, myConfigs);
// Update totalRecords on the fly with values from server
myDataTable.doBeforeLoadData = function(oRequest, oResponse, oPayload) {
- YAHOO.PORTICO.requestUrl = requestUrl + oRequest;
+ YAHOO.portico.requestUrl = requestUrl + oRequest;
oPayload.totalRecords = oResponse.meta.totalRecords;
oPayload.pagination.rowsPerPage = oResponse.meta.pageSize;
oPayload.pagination.recordOffset = oResponse.meta.startIndex;
return oPayload;
};
- YAHOO.PORTICO.DataTable = myDataTable;
+ YAHOO.portico.DataTable = myDataTable;
return {
ds: myDataSource,
@@ -176,7 +169,7 @@
};
};
-//YAHOO.util.Event.onDOMReady( YAHOO.PORTICO.init_datatable );
+//YAHOO.util.Event.onDOMReady( YAHOO.portico.init_datatable );
var FormatterRight = function(elCell, oRecord, oColumn, oData)
{
Modified: trunk/controller/templates/base/add_component_to_control.xsl
===================================================================
--- trunk/controller/templates/base/add_component_to_control.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/add_component_to_control.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -22,7 +22,7 @@
<div class="yui-content">
<div id="control_details">
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
<xsl:apply-templates select="control_filters" />
<xsl:apply-templates select="filter_form" />
<xsl:apply-templates select="paging"/>
Modified: trunk/controller/templates/base/add_component_to_control_group.xsl
===================================================================
--- trunk/controller/templates/base/add_component_to_control_group.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/add_component_to_control_group.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -22,7 +22,7 @@
<div class="yui-content">
<div id="control_group_details">
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
<xsl:apply-templates select="control_group_filters" />
<xsl:apply-templates select="filter_form" />
<xsl:apply-templates select="paging"/>
Modified: trunk/controller/templates/base/component.xsl
===================================================================
--- trunk/controller/templates/base/component.xsl 2012-06-18 13:39:24 UTC
(rev 9612)
+++ trunk/controller/templates/base/component.xsl 2012-06-18 13:41:01 UTC
(rev 9613)
@@ -32,7 +32,7 @@
<iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html" ></iframe>
<input id="yui-history-field" type="hidden"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
<xsl:apply-templates select="form" />
<xsl:apply-templates select="paging"/>
<div id="list_flash">
@@ -236,4 +236,4 @@
</script>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified: trunk/controller/templates/base/control/control_tabs.xsl
===================================================================
--- trunk/controller/templates/base/control/control_tabs.xsl 2012-06-18
13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/control/control_tabs.xsl 2012-06-18
13:41:01 UTC (rev 9613)
@@ -6,7 +6,7 @@
<xsl:choose>
<xsl:when test="view = 'control_details'">
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
<div class="identifier-header">
<h1><xsl:value-of select="php:function('lang',
'Control')"/></h1>
</div>
Modified: trunk/controller/templates/base/control_group/control_group.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_group.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/control_group/control_group.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -2,7 +2,7 @@
<!-- item -->
<xsl:template name="control_group" xmlns:php="http://php.net/xsl";>
-<xsl:call-template name="yui_booking_i18n"/>
+<xsl:call-template name="yui_phpgw_i18n"/>
<div id="details">
<form action="#" method="post">
Modified: trunk/controller/templates/base/control_group/control_group_items.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_group_items.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/control_group/control_group_items.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -1,7 +1,7 @@
<!-- $Id$ -->
<xsl:template name="control_group_items" xmlns:php="http://php.net/xsl";>
-<xsl:call-template name="yui_booking_i18n"/>
+<xsl:call-template name="yui_phpgw_i18n"/>
<div class="identifier-header">
</div>
<div>
Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/control_item/control_item.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -3,7 +3,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:call-template name="yui_booking_i18n"/>
+<xsl:call-template name="yui_phpgw_i18n"/>
<div id="main_content">
Modified: trunk/controller/templates/base/control_item/control_item_option.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item_option.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/control_item/control_item_option.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -5,7 +5,7 @@
-<xsl:call-template name="yui_booking_i18n"/>
+<xsl:call-template name="yui_phpgw_i18n"/>
<div id="main_wrp">
@@ -29,4 +29,4 @@
</div>
</div>
</div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified:
trunk/controller/templates/base/control_location/register_control_to_component.xsl
===================================================================
---
trunk/controller/templates/base/control_location/register_control_to_component.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++
trunk/controller/templates/base/control_location/register_control_to_component.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -19,8 +19,8 @@
<!-- separate tabs and inline tables-->
-
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="yui_phpgw_i18n"/>
<style type="text/css">
select { width: 100px; }
</style>
@@ -63,7 +63,6 @@
</xsl:choose>
<div class="body">
<div id="voucher_details">
- <!--<xsl:call-template
name="yui_phpgw_i18n"/>-->
<table align = "center"
width="95%">
<xsl:apply-templates
select="filter_form" />
</table>
@@ -91,59 +90,6 @@
<td colspan = '6'>
<table>
<tr>
-<!--
- <td>
- <xsl:value-of select="php:function('lang', 'control
area')" />
- </td>
- <td>
- <xsl:value-of select="php:function('lang', 'control')"
/>
- </td>
--->
- <td>
- <xsl:value-of select="php:function('lang',
'registered')" />
- </td>
- <td>
- <xsl:value-of select="php:function('lang', 'location
type')" />
- </td>
- <td>
- <xsl:value-of select="php:function('lang', 'location
category')" />
- </td>
- <td>
- <xsl:value-of select="php:function('lang', 'name')" />
- </td>
- </tr>
- <tr id="filter1">
-<!--
- <td>
- <select id="control_area_id" name="control_area_id">
- <xsl:apply-templates
select="control_area_list/options"/>
- </select>
- </td>
- <td>
- <select id="control_id" name="control_id">
- <xsl:apply-templates select="control/options"/>
- </select>
- </td>
--->
- <td >
- <input id= "control_registered" type="checkbox"
name="control_registered" value="1"/>
- </td>
-
- <td >
- <input id= "control_id_hidden" type="hidden"
name="control_id"/>
- <select id="location_type" name="location_type">
- <xsl:apply-templates
select="location_type_list/options"/>
- </select>
- </td>
- <td >
- <select id="location_type_category"
name="location_type_category">
- </select>
- </td>
- <td >
- <input type="text" value="" id="search-location-name" />
- <input id= "search-location_code" type="hidden"
name="search-location_code"/>
- </td>
- </tr>
<tr>
<td>
<xsl:value-of select="php:function('lang', 'entity')" />
@@ -207,6 +153,40 @@
</td>
-->
</tr>
+
+ <td>
+ <xsl:value-of select="php:function('lang',
'registered')" />
+ </td>
+ <td>
+ <xsl:value-of select="php:function('lang', 'location
type')" />
+ </td>
+ <td>
+ <xsl:value-of select="php:function('lang', 'location
category')" />
+ </td>
+ <td>
+ <xsl:value-of select="php:function('lang', 'name')" />
+ </td>
+ </tr>
+ <tr id="filter1">
+ <td >
+ <input id= "control_registered" type="checkbox"
name="control_registered" value="1"/>
+ </td>
+
+ <td >
+ <input id= "control_id_hidden" type="hidden"
name="control_id"/>
+ <select id="location_type" name="location_type">
+ <xsl:apply-templates
select="location_type_list/options"/>
+ </select>
+ </td>
+ <td >
+ <select id="location_type_category"
name="location_type_category">
+ </select>
+ </td>
+ <td colspan = '2'>
+ <input type="text" value="" id="search-location-name" />
+ <input id= "search-location_code" type="hidden"
name="search-location_code"/>
+ </td>
+ </tr>
</table>
</td>
</tr>
Modified:
trunk/controller/templates/base/control_location/register_control_to_location.xsl
===================================================================
---
trunk/controller/templates/base/control_location/register_control_to_location.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++
trunk/controller/templates/base/control_location/register_control_to_location.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -22,7 +22,7 @@
<div class="yui-content">
<div id="control_details">
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
<xsl:apply-templates select="control_filters" />
<xsl:apply-templates select="filter_form" />
<xsl:apply-templates select="paging"/>
Modified:
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
===================================================================
---
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -40,7 +40,7 @@
<input id="yui-history-field" type="hidden"/>
<xsl:apply-templates select="locations_table"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
</div>
</div>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-06-18 13:39:24 UTC
(rev 9612)
+++ trunk/controller/templates/base/css/base.css 2012-06-18 13:41:01 UTC
(rev 9613)
@@ -1019,12 +1019,12 @@
.check_item label{
width:150px;
-}
+}
.new_item a#innertoolbar-button{
background: grey;
font-weight: bold;
-}
+}
#frm_save_check_items input[type="submit"]{
padding: 3px 30px;
@@ -1936,4 +1936,4 @@
p.no_items_msg {
padding: 5px;
-}
\ No newline at end of file
+}
Modified: trunk/controller/templates/base/datatable.xsl
===================================================================
--- trunk/controller/templates/base/datatable.xsl 2012-06-18 13:39:24 UTC
(rev 9612)
+++ trunk/controller/templates/base/datatable.xsl 2012-06-18 13:41:01 UTC
(rev 9613)
@@ -19,7 +19,7 @@
<xsl:template name="datatable">
<iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"></iframe>
<input id="yui-history-field" type="hidden"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
<xsl:apply-templates select="form" />
<xsl:apply-templates select="paging"/>
<div id="list_flash">
Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -3,7 +3,7 @@
<xsl:template name="view_procedure" xmlns:php="http://php.net/xsl";>
-<xsl:call-template name="yui_booking_i18n"/>
+<xsl:call-template name="yui_phpgw_i18n"/>
<xsl:variable name="dateformat"><xsl:value-of select="dateformat"
/></xsl:variable>
<div class="yui-content">
Modified: trunk/controller/templates/base/procedure/procedure_tabs.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_tabs.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/procedure/procedure_tabs.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -2,7 +2,7 @@
<!-- separate tabs and inline tables-->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:call-template name="yui_booking_i18n"/>
+<xsl:call-template name="yui_phpgw_i18n"/>
<div class="yui-navset yui-navset-top" id="procedure_tabview">
<xsl:choose>
<xsl:when test="view = 'view_procedure'">
@@ -29,4 +29,4 @@
</xsl:choose>
</div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified: trunk/controller/templates/base/view_component_for_control.xsl
===================================================================
--- trunk/controller/templates/base/view_component_for_control.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/view_component_for_control.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -77,7 +77,7 @@
<input id="yui-history-field" type="hidden"/>
<xsl:apply-templates select="locations_table"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
</div>
</div>
</xsl:template>
Modified: trunk/controller/templates/base/view_component_for_control_group.xsl
===================================================================
--- trunk/controller/templates/base/view_component_for_control_group.xsl
2012-06-18 13:39:24 UTC (rev 9612)
+++ trunk/controller/templates/base/view_component_for_control_group.xsl
2012-06-18 13:41:01 UTC (rev 9613)
@@ -74,7 +74,7 @@
<input id="yui-history-field" type="hidden"/>
<xsl:apply-templates select="locations_table"/>
- <xsl:call-template name="yui_booking_i18n"/>
+ <xsl:call-template name="yui_phpgw_i18n"/>
</div>
</div>
</xsl:template>
Modified: trunk/registration/inc/class.uipending.inc.php
===================================================================
--- trunk/registration/inc/class.uipending.inc.php 2012-06-18 13:39:24 UTC
(rev 9612)
+++ trunk/registration/inc/class.uipending.inc.php 2012-06-18 13:41:01 UTC
(rev 9613)
@@ -27,9 +27,9 @@
*/
phpgw::import_class('phpgwapi.yui');
- phpgw::import_class('registration.uicommon');
+ phpgw::import_class('phpgwapi.uicommon');
- class registration_uipending extends registration_uicommon
+ class registration_uipending extends phpgwapi_uicommon
{
var $cat_id;
var $start;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9613] controller: uicommon,
Sigurd Nes <=