[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12291] remove obsolete xmlns:php
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12291] remove obsolete xmlns:php |
|
Date: |
Wed, 12 Nov 2014 09:45:10 +0000 |
Revision: 12291
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12291
Author: sigurdne
Date: 2014-11-12 09:45:10 +0000 (Wed, 12 Nov 2014)
Log Message:
-----------
remove obsolete xmlns:php
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/inc/class.common.inc.php
branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php
branches/dev-syncromind/phpgwapi/templates/base/jquery_phpgw_i18n.xsl
branches/dev-syncromind/preferences/index.php
branches/dev-syncromind/preferences/preferences.php
branches/dev-syncromind/preferences/templates/base/index.tpl
branches/dev-syncromind/preferences/templates/base/preferences.tpl
branches/dev-syncromind/property/templates/base/attributes_form.xsl
branches/dev-syncromind/property/templates/base/condition_survey.xsl
branches/dev-syncromind/property/templates/base/entity.xsl
branches/dev-syncromind/property/templates/base/generic.xsl
branches/dev-syncromind/property/templates/base/location_view2.xsl
Modified: branches/dev-syncromind/phpgwapi/inc/class.common.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.common.inc.php 2014-11-12
09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/phpgwapi/inc/class.common.inc.php 2014-11-12
09:45:10 UTC (rev 12291)
@@ -511,10 +511,9 @@
$html = phpgwapi_jquery::tabview_generate($tabs,
$selection);
$output = <<<HTML
- <div id="tab-content">
- {$html}
- </div>
+ {$html}
+
HTML;
return $output;
}
Modified: branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php 2014-11-12
09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php 2014-11-12
09:45:10 UTC (rev 12291)
@@ -190,7 +190,7 @@
if($tab['link'] && !preg_match('/(^#)/i', $tab['link']))
{
$_function = " onclick=\"javascript:
window.location = '{$tab['link']}';\"";
- $tab['link'] = "#";
+ $tab['link'] = "#{$id}";
}
$output .= <<<HTML
Modified: branches/dev-syncromind/phpgwapi/templates/base/jquery_phpgw_i18n.xsl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/base/jquery_phpgw_i18n.xsl
2014-11-12 09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/phpgwapi/templates/base/jquery_phpgw_i18n.xsl
2014-11-12 09:45:10 UTC (rev 12291)
@@ -1,4 +1,4 @@
- <xsl:template name="jquery_phpgw_i18n" xmlns:php="http://php.net/xsl";>
+ <xsl:template name="jquery_phpgw_i18n">
<xsl:if test="jquery_phpgw_i18n">
<script type="text/javascript">
JqueryPortico.i18n = {
Modified: branches/dev-syncromind/preferences/index.php
===================================================================
--- branches/dev-syncromind/preferences/index.php 2014-11-12 09:44:03 UTC
(rev 12290)
+++ branches/dev-syncromind/preferences/index.php 2014-11-12 09:45:10 UTC
(rev 12291)
@@ -62,17 +62,22 @@
$tabs = array();
$tabs['user'] = array(
'label' => lang('Your preferences'),
- 'link' =>
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'user'))
+ 'link' =>
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'user')),
+ 'disable'=> 0
);
$tabs['default'] = array(
'label' => lang('Default preferences'),
- 'link' =>
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'default'))
+ 'link' =>
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'default')),
+ 'disable'=> 0
);
$tabs['forced'] = array(
'label' => lang('Forced preferences'),
- 'link' =>
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'forced'))
+ 'link' =>
$GLOBALS['phpgw']->link('/preferences/index.php',array('type'=>'forced')),
+ 'disable'=> 0
);
$GLOBALS['phpgw']->template->set_var('tabs',
$GLOBALS['phpgw']->common->create_tabs($tabs, $type));
+ $GLOBALS['phpgw']->template->set_var('tab_id', $type);
+
$GLOBALS['phpgw']->common->phpgw_header(true);
/**
@@ -83,7 +88,7 @@
*/
function section_start($appname='', $icon='')
{
- $GLOBALS['phpgw']->template->set_var('a_name', $appname);
+ $GLOBALS['phpgw']->template->set_var('a_name', str_replace(" ",
"_", $appname));
$GLOBALS['phpgw']->template->set_var('app_name', $appname);
$GLOBALS['phpgw']->template->set_var('app_icon', $icon);
if ( $icon )
Modified: branches/dev-syncromind/preferences/preferences.php
===================================================================
--- branches/dev-syncromind/preferences/preferences.php 2014-11-12 09:44:03 UTC
(rev 12290)
+++ branches/dev-syncromind/preferences/preferences.php 2014-11-12 09:45:10 UTC
(rev 12291)
@@ -497,6 +497,8 @@
{
global $t,$list_shown;
+ $tab_id = $GLOBALS['type'];
+ $t->set_var('tab_id',$tab_id);
$t->set_var('list_header',$header);
$t->parse('lists','list',$list_shown);
@@ -670,15 +672,15 @@
}
if (is_admin())
{
- $tabs[] = array(
+ $tabs['user'] = array(
'label' => lang('Your preferences'),
'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$appname, 'type'=> 'user'))
);
- $tabs[] = array(
+ $tabs['default'] = array(
'label' => lang('Default preferences'),
'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$appname, 'type'=> 'default'))
);
- $tabs[] = array(
+ $tabs['forced'] = array(
'label' => lang('Forced preferences'),
'link' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php',array('appname'=>
$appname, 'type'=> 'forced'))
);
@@ -739,17 +741,24 @@
$t->set_var('account_id', "<input
type='hidden' name='account_id' value='{$account_id}'>");
}
+ $pre_div = '<div id="user">';
+ $post_div ='</div><div id="default"></div><div
id="forced"></div>';
break;
-
case 'default':
- $selected = 1;
+ $pre_div = '<div id="user"></div><div
id="default">';
+ $post_div ='</div><div id="forced"></div>';
break;
- case 'forced':
- $selected = 2;
+ case 'forced';
+ $pre_div = '<div id="user"></div><div
id="default"></div><div id="forced">';
+ $post_div ='</div>';
break;
+
}
-
$t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$selected));
+ $t->set_var('pre_div',$pre_div);
+ $t->set_var('post_div',$post_div);
+
$t->set_var('tabs',$GLOBALS['phpgw']->common->create_tabs($tabs,$GLOBALS['type']));
+
}
$t->set_var('lang_submit', lang('save'));
$t->set_var('lang_cancel', lang('cancel'));
Modified: branches/dev-syncromind/preferences/templates/base/index.tpl
===================================================================
--- branches/dev-syncromind/preferences/templates/base/index.tpl
2014-11-12 09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/preferences/templates/base/index.tpl
2014-11-12 09:45:10 UTC (rev 12291)
@@ -1,12 +1,24 @@
<!-- BEGIN list -->
<div id="preferences-index">
- {tabs}
- {rows}
+ <div id="tab-content">
+ {tabs}
+ <div id="user">
+ {rows}
+ </div>
+ <div id="default">
+ {rows}
+ </div>
+ <div id="forced">
+ {rows}
+ </div>
+
+ </div>
</div>
<!-- END list -->
<!-- BEGIN app_row -->
<h2><a name="{a_name}"></a><img src="{app_icon}" alt="{app_name}">
{app_name}</h2>
+ <ul>
<!-- END app_row -->
<!-- BEGIN app_row_noicon -->
Modified: branches/dev-syncromind/preferences/templates/base/preferences.tpl
===================================================================
--- branches/dev-syncromind/preferences/templates/base/preferences.tpl
2014-11-12 09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/preferences/templates/base/preferences.tpl
2014-11-12 09:45:10 UTC (rev 12291)
@@ -1,13 +1,17 @@
<div class="error_message">{messages}</div>
<!-- BEGIN form -->
+<div id="tab-content">
{tabs}
{select_user}
<form method="POST" action="{action_url}" class="pure-form pure-form-aligned">
{account_id}
<!-- BEGIN list -->
- {list_header}
- {rows}
+ {pre_div}
+ {list_header}
+ {rows}
+ {post_div}
+
<!-- END list -->
<div class="button_group">
@@ -16,6 +20,7 @@
{help_button}
</div>
</form>
+</div>
<!-- END form -->
<!-- BEGIN row -->
Modified: branches/dev-syncromind/property/templates/base/attributes_form.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/attributes_form.xsl
2014-11-12 09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/property/templates/base/attributes_form.xsl
2014-11-12 09:45:10 UTC (rev 12291)
@@ -6,11 +6,7 @@
<!-- New template-->
<xsl:template xmlns:php="http://php.net/xsl"; name="attributes_values">
<xsl:for-each select="attributes_group">
- <div class="content-wrp">
- <fieldset>
- <xsl:apply-templates
select="attributes"/>
- </fieldset>
- </div>
+ <xsl:apply-templates select="attributes"/>
</xsl:for-each>
</xsl:template>
Modified: branches/dev-syncromind/property/templates/base/condition_survey.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/condition_survey.xsl
2014-11-12 09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/property/templates/base/condition_survey.xsl
2014-11-12 09:45:10 UTC (rev 12291)
@@ -50,7 +50,7 @@
<xsl:value-of disable-output-escaping="yes" select="tabs"/>
- <div id="generic" class="content-wrp">
+ <div id="generic">
<fieldset>
<xsl:choose>
@@ -244,14 +244,11 @@
<xsl:call-template name="datasource-definition" />
- <dl class="proplist-col">
+ <div class="pure-control-group">
- <dt>
<label>
<xsl:value-of select="php:function('lang',
'files')"/>
</label>
- </dt>
- <dd>
<!--div style="clear:both;"
id="datatable-container_0"></div-->
<xsl:for-each
select="datatable_def">
<xsl:if
test="container = 'datatable-container_0'">
@@ -262,14 +259,12 @@
</xsl:call-template>
</xsl:if>
</xsl:for-each>
- </dd>
-
<xsl:choose>
<xsl:when test="editable = 1">
<xsl:call-template name="file_upload"/>
</xsl:when>
</xsl:choose>
- </dl>
+ </div>
</div>
<div id="request">
<dl class="proplist-col">
@@ -342,27 +337,22 @@
<div id="import">
<xsl:choose>
<xsl:when test="editable = 1">
- <dl class="proplist-col">
- <dt>
+ <div
class="pure-control-group">
<label>
<xsl:value-of
select="php:function('lang', 'upload file')"/>
</label>
- </dt>
- <dd>
<input type="file" name="import_file"
size="40">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
</xsl:attribute>
</input>
- </dd>
- </dl>
+ </div>
</xsl:when>
</xsl:choose>
</div>
</div>
- <dl class="proplist-col">
- <div class="form-buttons">
- <xsl:variable name="lang_cancel">
+ <div class="proplist-col">
+ <xsl:variable name="lang_cancel">
<xsl:value-of select="php:function('lang', 'cancel')"
/>
</xsl:variable>
<xsl:choose>
@@ -385,11 +375,7 @@
<input class="pure-button pure-button-primary"
type="button" name="cancelButton" id ='cancelButton' value="{$lang_cancel}"
title = "{$lang_cancel}" onClick="document.cancel_form.submit();"/>
</xsl:otherwise>
</xsl:choose>
- </div>
-
-
- </dl>
-
+ </div>
</form>
</div>
Modified: branches/dev-syncromind/property/templates/base/entity.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/entity.xsl 2014-11-12
09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/property/templates/base/entity.xsl 2014-11-12
09:45:10 UTC (rev 12291)
@@ -39,7 +39,7 @@
<xsl:value-of select="php:function('lang',
'inventory')" />
</xsl:variable>
- <form name="form" id="edit_inventory" action="{$action_url}"
method="post">
+ <form name="form" id="edit_inventory" action="{$action_url}"
method="post" class= "pure-form-aligned">
<fieldset>
<legend>
@@ -430,7 +430,7 @@
<xsl:variable name="form_action">
<xsl:value-of select="form_action"/>
</xsl:variable>
- <form id="form" name="form" action="{$form_action}"
method="post" ENCTYPE="multipart/form-data">
+ <form id="form" name="form" action="{$form_action}"
method="post" ENCTYPE="multipart/form-data" class= "pure-form-aligned">
<input type="hidden" name="active_tab"
value="{active_tab}"/>
<table cellpadding="2" cellspacing="2"
width="80%" align="center">
<xsl:choose>
Modified: branches/dev-syncromind/property/templates/base/generic.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/generic.xsl 2014-11-12
09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/property/templates/base/generic.xsl 2014-11-12
09:45:10 UTC (rev 12291)
@@ -22,7 +22,7 @@
<xsl:value-of select="validator"/>
- <form method="post" action="{$form_action}">
+ <form method="post" action="{$form_action}"
class="pure-form-aligned">
<dl>
<xsl:choose>
<xsl:when test="msgbox_data !=
''">
@@ -169,11 +169,10 @@
</div>
</xsl:for-each>
+ <xsl:call-template
name="attributes_values"/>
</fieldset>
</div>
- <xsl:call-template
name="attributes_values"/>
-
<div class="form-buttons">
<input type="submit"
name="values[save]" value="{lang_save}" onMouseout="window.status='';return
true;">
<xsl:attribute
name="title">
Modified: branches/dev-syncromind/property/templates/base/location_view2.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/location_view2.xsl
2014-11-12 09:44:03 UTC (rev 12290)
+++ branches/dev-syncromind/property/templates/base/location_view2.xsl
2014-11-12 09:45:10 UTC (rev 12291)
@@ -8,10 +8,9 @@
<xsl:for-each select="location">
<xsl:choose>
<xsl:when test="value !=''">
- <dt>
- <label><xsl:value-of
select="name"/></label>
- </dt>
- <dd align="left">
+ <div class="pure-control-group">
+ <label><xsl:value-of
select="name"/>
+ </label>
<xsl:choose>
<xsl:when
test="input_type !='hidden'">
<xsl:choose>
@@ -35,7 +34,7 @@
</xsl:when>
</xsl:choose>
</xsl:for-each>
- </dd>
+ </div>
</xsl:when>
</xsl:choose>
</xsl:for-each>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12291] remove obsolete xmlns:php,
Sigurd Nes <=