|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16662] formatting |
| Date: | Mon, 1 May 2017 14:10:43 -0400 (EDT) |
Revision: 16662
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16662
Author: sigurdne
Date: 2017-05-01 14:10:43 -0400 (Mon, 01 May 2017)
Log Message:
-----------
formatting
Modified Paths:
--------------
trunk/phpgwapi/templates/base/attributes_form.xsl
trunk/phpgwapi/templates/pure/js/mmenu.js
trunk/property/inc/class.bolocation.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/templates/base/location_form2.xsl
trunk/property/templates/base/tts.xsl
Modified: trunk/phpgwapi/templates/base/attributes_form.xsl
===================================================================
--- trunk/phpgwapi/templates/base/attributes_form.xsl 2017-04-30 11:47:12 UTC
(rev 16661)
+++ trunk/phpgwapi/templates/base/attributes_form.xsl 2017-05-01 18:10:43 UTC
(rev 16662)
@@ -130,7 +130,7 @@
</xsl:call-template>
</xsl:when>
<xsl:when test="datatype='LB'">
- <select id="id_{name}"
name="values_attribute[{id}][value]" title="{$statustext}">
+ <select id="id_{name}"
name="values_attribute[{id}][value]" title="{$statustext}"
class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -270,7 +270,7 @@
<xsl:value-of
select="name"/>
<xsl:text>();</xsl:text>
</xsl:variable>
- <input type="text" id="{name}"
name="{name}" value="{value}" onClick="{$lookup_function}" readonly="readonly"
size="6">
+ <input type="hidden"
id="{name}" name="{name}" value="{value}" onClick="{$lookup_function}"
readonly="readonly" size="6">
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -284,7 +284,7 @@
</xsl:when>
</xsl:choose>
</input>
- <input size="30" type="text"
id="{$vendor_name}" name="{$vendor_name}" value="{vendor_name}"
onClick="{$lookup_function}" readonly="readonly">
+ <input size="30" type="text"
id="{$vendor_name}" name="{$vendor_name}" value="{vendor_name}"
onClick="{$lookup_function}" readonly="readonly" class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -295,7 +295,7 @@
</input>
</xsl:when>
<xsl:when test="datatype='custom1'">
- <select
name="values_attribute[{id}][value]">
+ <select
name="values_attribute[{id}][value]" class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -340,7 +340,7 @@
<xsl:value-of
select="name"/>
<xsl:text>();</xsl:text>
</xsl:variable>
- <input type="text"
name="{name}" value="{value}" onClick="{$lookup_function}" readonly="readonly"
size="6">
+ <input type="hidden"
name="{name}" value="{value}" onClick="{$lookup_function}" readonly="readonly"
size="6">
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -354,7 +354,7 @@
</xsl:when>
</xsl:choose>
</input>
- <input size="30" type="text"
name="{$custom_name}" value="{custom_name}" onClick="{$lookup_function}"
readonly="readonly">
+ <input size="30" type="text"
name="{$custom_name}" value="{custom_name}" onClick="{$lookup_function}"
readonly="readonly" class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -418,7 +418,7 @@
<xsl:value-of
select="name"/>
<xsl:text>();</xsl:text>
</xsl:variable>
- <input type="text" id="{name}"
name="values_attribute[{id}][value]" value="{value}"
onClick="{$lookup_function}" readonly="readonly" size="6">
+ <input type="hidden"
id="{name}" name="values_attribute[{id}][value]" value="{value}"
onClick="{$lookup_function}" readonly="readonly" size="6">
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -432,7 +432,7 @@
</xsl:when>
</xsl:choose>
</input>
- <input size="30" type="text"
id="{$user_name}" name="{$user_name}" value="{user_name}"
onClick="{$lookup_function}" readonly="readonly">
+ <input size="30" type="text"
id="{$user_name}" name="{$user_name}" value="{user_name}"
onClick="{$lookup_function}" readonly="readonly" class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -529,7 +529,7 @@
</table>
</xsl:when>
<xsl:when test="datatype='T'">
- <textarea id="id_{name}"
name="values_attribute[{id}][value]">
+ <textarea id="id_{name}"
name="values_attribute[{id}][value]" class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -707,7 +707,7 @@
</input>
</xsl:when>
<xsl:when test="datatype='email'">
- <input data-validation="email"
id="id_{name}" type="text" name="values_attribute[{id}][value]" value="{value}"
size="30">
+ <input data-validation="email"
id="id_{name}" type="text" name="values_attribute[{id}][value]" value="{value}"
size="30" class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -723,7 +723,7 @@
</input>
</xsl:when>
<xsl:otherwise>
- <input id="id_{name}"
type="text" name="values_attribute[{id}][value]" value="{value}" size="30">
+ <input id="id_{name}"
type="text" name="values_attribute[{id}][value]" value="{value}" size="30"
class="pure-input-1-2" >
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
Modified: trunk/phpgwapi/templates/pure/js/mmenu.js
===================================================================
--- trunk/phpgwapi/templates/pure/js/mmenu.js 2017-04-30 11:47:12 UTC (rev
16661)
+++ trunk/phpgwapi/templates/pure/js/mmenu.js 2017-05-01 18:10:43 UTC (rev
16662)
@@ -128,6 +128,21 @@
});
});
+ $(window).resize(function ()
+ {
+
+ $('.pure-form-aligned').each(function (i, obj)
+ {
+
$(this).removeClass('pure-form-aligned').addClass('pure-form-stacked');
+ });
+ $('.pure-input-1-2').each(function (i, obj)
+ {
+
$(this).removeClass('pure-input-1-2').addClass('pure-input-1');
+ });
+
+ })
+ .resize();//trigger the resize event on page load.
+
});
function update_bookmark_menu(bookmark_candidate)
@@ -149,43 +164,3 @@
});
}
-/*
- 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: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2017-04-30 11:47:12 UTC (rev
16661)
+++ trunk/property/inc/class.bolocation.inc.php 2017-05-01 18:10:43 UTC (rev
16662)
@@ -452,6 +452,7 @@
$location['location'][$i]['extra'][0]['readonly'] = true;
$input_name[] =
$location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['size'] = 30;
+
$location['location'][$i]['extra'][0]['class'] = 'pure-u-3-5';
$location['location'][$i]['extra'][0]['lookup_function_call'] = $_lookup_link ?
"lookup_loc{$config[$j]['location_type']}()" : '';
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['street_name']) ? $data['values']['street_name'] : '');
@@ -460,6 +461,7 @@
$location['location'][$i]['extra'][1]['readonly'] = true;
$input_name[] =
$location['location'][$i]['extra'][1]['input_name'];
$location['location'][$i]['extra'][1]['size'] = 6;
+
$location['location'][$i]['extra'][1]['class'] = 'pure-u-1-6';
$location['location'][$i]['extra'][1]['lookup_function_call'] = $_lookup_link ?
"lookup_loc{$config[$j]['location_type']}()" : '';
$location['location'][$i]['extra'][1]['value'] =
(isset($data['values']['street_number']) ? $data['values']['street_number'] :
'');
$i++;
@@ -491,6 +493,7 @@
$location['location'][$i]['extra'][0]['readonly'] = true;
$input_name[] =
$location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['size'] = 15;
+
$location['location'][$i]['extra'][0]['class'] = 'pure-u-1-2';
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc' .
($m + 1) . '()';
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['last_name']) ? $data['values']['last_name'] : '');
$location['location'][$i]['extra'][0]['statustext'] = lang('last name');
@@ -500,6 +503,7 @@
$location['location'][$i]['extra'][1]['readonly'] = true;
$input_name[] =
$location['location'][$i]['extra'][1]['input_name'];
$location['location'][$i]['extra'][1]['size'] = 15;
+
$location['location'][$i]['extra'][1]['class'] = 'pure-u-1-2';
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc' .
($m + 1) . '()';
$location['location'][$i]['extra'][1]['value'] =
(isset($data['values']['first_name']) ? $data['values']['first_name'] : '');
$location['location'][$i]['extra'][1]['statustext'] = lang('first name');
@@ -509,6 +513,7 @@
$location['location'][$i]['input_name'] = 'contact_phone';
$input_name[] =
$location['location'][$i]['input_name'];
$location['location'][$i]['size'] = 12;
+
$location['location'][$i]['class'] = 'pure-u-1-2';
$location['location'][$i]['lookup_function_call'] =
'';//$lookup_functions[$m]['name'];
$insert_record['extra']['contact_phone'] = 'contact_phone';
$location['location'][$i]['value'] = (isset($data['values']['contact_phone']) ?
$data['values']['contact_phone'] : '');
@@ -521,6 +526,7 @@
$input_name[] =
$location['location'][$i]['input_name'];
// $insert_record[]
=
$location['location'][$i]['input_name'];
$location['location'][$i]['size'] = 5;
+
$location['location'][$i]['class'] = 'pure-u-1-6';
$location['location'][$i]['value'] =
$data['location']['value'][$config[$j]['column_name']];
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_cols[$j]['location_type'] . '()';
$location['location'][$i]['lookup_link'] = $_lookup_link;
@@ -580,6 +586,7 @@
$insert_record['extra']['entity_num_' .
$entity['id']] = 'p_num';
$location['location'][$i]['size'] = 8;
+ $location['location'][$i]['class'] =
'pure-u-1-6';
$location['location'][$i]['lookup_function_call'] = 'lookup_entity_' .
$entity['id'] . '()';
$location['location'][$i]['lookup_link'] = true;
$location['location'][$i]['name'] =
$entity['name'];
@@ -594,6 +601,7 @@
$input_name_entity[] =
$location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['input_type'] = 'text';
$location['location'][$i]['extra'][0]['size'] = 30;
+
$location['location'][$i]['extra'][0]['size'] = 'pure-u-3-5';
$location['location'][$i]['extra'][0]['lookup_function_call'] =
'lookup_entity_' . $entity['id'] . '()';
$location['location'][$i]['extra'][0]['is_entity'] = true;
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-04-30 11:47:12 UTC (rev
16661)
+++ trunk/property/inc/class.uitts.inc.php 2017-05-01 18:10:43 UTC (rev
16662)
@@ -1638,7 +1638,7 @@
- $cat_select =
$this->cats->formatted_xslt_list(array('select_name' => 'values[cat_id]',
'use_acl' => $this->_category_acl, 'required' => true));
+ $cat_select =
$this->cats->formatted_xslt_list(array('select_name' => 'values[cat_id]',
'use_acl' => $this->_category_acl, 'required' => true, 'class' =>
'pure-input-1-2'));
$_cat_list = array();
if($this->simple && isset($fmttssimple_categories) &&
$fmttssimple_categories[1])
@@ -2844,7 +2844,7 @@
//_debug_array($supervisor_email);die();
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$cat_select =
$this->cats->formatted_xslt_list(array('select_name' => 'values[cat_id]',
- 'selected' => $this->cat_id, 'use_acl' =>
$this->_category_acl, 'required' => true));
+ 'selected' => $this->cat_id, 'use_acl' =>
$this->_category_acl, 'required' => true, 'class' => 'pure-input-1-2'));
$_ticket_cat_found = false;
if (isset($cat_select['cat_list']) &&
is_array($cat_select['cat_list']))
Modified: trunk/property/templates/base/location_form2.xsl
===================================================================
--- trunk/property/templates/base/location_form2.xsl 2017-04-30 11:47:12 UTC
(rev 16661)
+++ trunk/property/templates/base/location_form2.xsl 2017-05-01 18:10:43 UTC
(rev 16662)
@@ -1,82 +1,103 @@
<!-- $Id$ -->
<xsl:template name="location_form2">
- <xsl:apply-templates select="location_data2"/>
+ <xsl:apply-templates select="location_data2"/>
</xsl:template>
<!-- New template-->
<xsl:template match="location_data2" xmlns:php="http://php.net/xsl";>
- <xsl:for-each select="location">
+ <xsl:for-each select="location">
<div class="pure-control-group">
- <label title="{statustext}">
- <xsl:choose>
- <xsl:when test="lookup_link=1">
- <a
href="javascript:{lookup_function_call}" title="{statustext}">
- <xsl:value-of
select="name"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
+ <label title="{statustext}">
+ <xsl:choose>
+ <xsl:when test="lookup_link=1">
+ <a
href="javascript:{lookup_function_call}" title="{statustext}">
<xsl:value-of
select="name"/>
- </xsl:otherwise>
- </xsl:choose>
- </label>
-
- <xsl:choose>
- <xsl:when test="readonly=1">
- <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
- <xsl:if
test="input_type != 'hidden' and required = 1">
- <xsl:attribute
name="title">
-
<xsl:value-of select="statustext"/>
- </xsl:attribute>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </label>
+ <div class="pure-g pure-custom">
+ <div>
+ <xsl:if test="input_type != 'hidden'">
+ <xsl:attribute name="class">
+
<xsl:text>pure-u-1-6</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="class != ''">
+ <xsl:attribute
name="class">
+ <xsl:value-of
select="class"/>
+ </xsl:attribute>
+ </xsl:if>
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <xsl:if test="input_type !=
'hidden'">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-input-1</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="readonly=1">
+ <xsl:attribute
name="class">
+
<xsl:text>readonly</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="input_type !=
'hidden' and required = 1">
+ <xsl:attribute
name="title">
+ <xsl:value-of
select="statustext"/>
+ </xsl:attribute>
<xsl:attribute
name="data-validation">
<xsl:text>required</xsl:text>
- </xsl:attribute>
+ </xsl:attribute>
<xsl:attribute
name="data-validation-error-msg">
<xsl:value-of
select="php:function('lang', 'Please select a location !')"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <xsl:for-each select="extra">
+ <div>
+ <xsl:if test="input_type !=
'hidden'">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-u-3-5</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ <xsl:if test="class != ''">
+ <xsl:attribute
name="class">
+ <xsl:value-of
select="class"/>
+ </xsl:attribute>
+ </xsl:if>
+ <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <xsl:if
test="input_type != 'hidden'">
+ <xsl:attribute
name="class">
+
<xsl:text>pure-input-1</xsl:text>
</xsl:attribute>
</xsl:if>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
- <xsl:if
test="input_type != 'hidden'">
- <xsl:attribute
name="title">
-
<xsl:value-of select="statustext"/>
+ <xsl:if
test="readonly=1">
+ <xsl:attribute
name="readonly">
+
<xsl:text>readonly</xsl:text>
</xsl:attribute>
</xsl:if>
- </input>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:for-each select="extra">
- <xsl:choose>
- <xsl:when test="readonly=1">
- <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
- <xsl:attribute
name="title">
-
<xsl:value-of select="statustext"/>
- </xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input size="{size}"
type="{input_type}" id="{input_name}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
- <xsl:attribute
name="title">
-
<xsl:value-of select="statustext"/>
- </xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="is_entity=1">
- <input type="checkbox"
name="clear_{input_name}_box" onClick="blank_entity_values()">
<xsl:attribute
name="title">
- <xsl:value-of
select="php:function('lang', 'delete')"/>
+ <xsl:value-of
select="statustext"/>
</xsl:attribute>
- <xsl:attribute
name="readonly">
-
<xsl:text>readonly</xsl:text>
- </xsl:attribute>
</input>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="is_entity=1">
+ <input
type="checkbox" name="clear_{input_name}_box" onClick="blank_entity_values()">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'delete')"/>
+
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+ </input>
+ </xsl:when>
+ </xsl:choose>
+ </div>
</xsl:for-each>
+ </div>
</div>
- </xsl:for-each>
+ </xsl:for-each>
</xsl:template>
Modified: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl 2017-04-30 11:47:12 UTC (rev
16661)
+++ trunk/property/templates/base/tts.xsl 2017-05-01 18:10:43 UTC (rev
16662)
@@ -115,7 +115,7 @@
<xsl:variable
name="select_priority_name">
<xsl:value-of select="select_priority_name"/>
</xsl:variable>
- <select
name="{$select_priority_name}">
+ <select
name="{$select_priority_name}" class="pure-input-1-2" >
<xsl:apply-templates select="priority_list/options"/>
</select>
</div>
@@ -124,7 +124,7 @@
<xsl:value-of select="php:function('lang', 'status')"/>
</label>
- <select
id="status_id" name="values[status]">
+ <select
id="status_id" name="values[status]" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Set the status of the ticket')"/>
</xsl:attribute>
@@ -442,7 +442,7 @@
<xsl:value-of select="$lang_make_relation"/>
</a>
</label>
- <select
name="make_relation" id="make_relation">
+ <select
name="make_relation" id="make_relation" class="pure-input-1-2" >
<xsl:attribute
name="title">
<xsl:value-of select="$lang_make_relation"/>
</xsl:attribute>
@@ -534,7 +534,7 @@
<xsl:variable
name="select_priority_name">
<xsl:value-of
select="select_priority_name"/>
</xsl:variable>
- <select
name="{$select_priority_name}" title="{$lang_priority_statustext}">
+ <select
name="{$select_priority_name}" title="{$lang_priority_statustext}"
class="pure-input-1-2" >
<xsl:if test="simple
='1'">
<xsl:attribute
name="disabled">
<xsl:text>disabled</xsl:text>
@@ -549,7 +549,7 @@
<label>
<xsl:value-of select="php:function('lang', 'status')"/>
</label>
- <select
id="status_id" name="values[status]">
+ <select
id="status_id" name="values[status]" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Set the status of the ticket')"/>
</xsl:attribute>
@@ -862,7 +862,7 @@
<xsl:value-of select="$lang_building_part"/>
</label>
-
<select name="values[building_part]">
+
<select name="values[building_part]" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="$lang_building_part"/>
</xsl:attribute>
@@ -884,7 +884,7 @@
<label>
<xsl:value-of select="php:function('lang', 'branch')"/>
</label>
-
<select name="values[branch_id]">
+
<select name="values[branch_id]" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang',
'select branch')"/>
</xsl:attribute>
@@ -903,7 +903,7 @@
<label>
<xsl:value-of select="$lang_order_dim1"/>
</label>
-
<select name="values[order_dim1]">
+
<select name="values[order_dim1]" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'order_dim1')"/>
</xsl:attribute>
@@ -927,7 +927,7 @@
<label>
<xsl:value-of select="$lang_tax_code"/>
</label>
-
<select name="values[tax_code]">
+
<select name="values[tax_code]" class="pure-input-1-2" >
<xsl:attribute name="title">
<xsl:value-of select="$lang_tax_code"/>
</xsl:attribute>
| [Prev in Thread] | Current Thread | [Next in Thread] |