[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14769] Merge 14765:14768 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14769] Merge 14765:14768 from trunk |
|
Date: |
Mon, 22 Feb 2016 22:17:35 +0000 |
Revision: 14769
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14769
Author: sigurdne
Date: 2016-02-22 22:17:34 +0000 (Mon, 22 Feb 2016)
Log Message:
-----------
Merge 14765:14768 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
branches/Version-2_0-branch/phpgwapi/templates/pure/css/demo_mmenu.css
branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/js/portico/tts.add.js
branches/Version-2_0-branch/property/templates/base/css/base.css
branches/Version-2_0-branch/property/templates/base/location_form2.xsl
branches/Version-2_0-branch/property/templates/base/tts.xsl
branches/Version-2_0-branch/property/templates/base/user_id_select.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768
Modified:
branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/phpgwapi/templates/base/datatable_jquery.xsl
2016-02-22 22:17:34 UTC (rev 14769)
@@ -38,7 +38,7 @@
<xsl:call-template name="msgbox"/>
</div>
<div id="message" class='message'/>
- <xsl:apply-templates select="datatable"/>
+ <xsl:apply-templates select="datatable"/>
<xsl:apply-templates select="form/list_actions"/>
</xsl:template>
@@ -574,7 +574,7 @@
<script type="text/javascript" class="init">
var lang_ButtonText_columns = "<xsl:value-of
select="php:function('lang', 'columns')"/>";
-
+
var oTable = null;
$(document).ready(function() {
var ajax_url = '<xsl:value-of select="source"/>';
@@ -705,6 +705,7 @@
return false;
}
</xsl:if>
+
fnSetSelected(this);
<xsl:value-of select="custom_code"/>
}
}<xsl:value-of select="phpgw:conditional(not(position() = last()), ',', '')"/>
@@ -723,6 +724,9 @@
</xsl:choose>
action: function (e, dt, node, config) {
var receiptmsg = [];
+
+
fnSetSelected(this);
+
var selected = fnGetSelected();
var numSelected = selected.length;
@@ -938,7 +942,7 @@
}
}
-
+
if(active_filters_html.length > 0)
{
$('#active_filters').html("Aktive filter: " + active_filters_html.join(', '));
@@ -956,21 +960,21 @@
fnDrawCallback: function () {
oTable.makeEditable({
sUpdateURL:
editor_action,
- fnOnEditing:
function(input){
+ fnOnEditing:
function(input){
cell =
input.parents("td");
id =
input.parents("tr").children("td:first").text();
return true;
},
fnOnEdited:
function(status, sOldValue, sNewCellDisplayValue, aPos0, aPos1, aPos2)
- {
+ {
document.getElementById("message").innerHTML += '<br/>' + status;
},
- oUpdateParameters: {
+ oUpdateParameters: {
"id":
function(){ return id; }
},
- aoColumns: editor_cols,
+ aoColumns: editor_cols,
sSuccessResponse: "IGNORE",
- fnShowError:
function(){ return; }
+ fnShowError:
function(){ return; }
});
if(typeof(addFooterDatatable) ==
'function')
{
@@ -1118,12 +1122,27 @@
return aReturn;
}
+ function fnSetSelected( row )
+ {
+ if(typeof(row[0]) == 'undefined')
+ {
+ return false;
+ }
+
+ var sectionRowIndex = row[0].sectionRowIndex;
+ if(typeof(sectionRowIndex) != 'undefined')
+ {
+ var table = oTable.DataTable();
+ var selected = table.row(
sectionRowIndex ).select();
+ }
+ }
+
function execute_ajax(requestUrl, callback, data,type,
dataType)
- {
+ {
type = typeof type !== 'undefined' ? type :
'POST';
dataType = typeof dataType !== 'undefined' ?
dataType : 'html';
data = typeof data !== 'undefined' ? data : {};
-
+
$.ajax({
type: type,
dataType: dataType,
@@ -1171,12 +1190,12 @@
oTable.dataTableSettings[0]['ajax']['data'][param] =
value;
oTable.fnDraw();
}
-
+
function clearFilterParam(param)
{
oTable.dataTableSettings[0]['ajax']['data'][param] = '';
}
-
+
function reloadData()
{
var api = oTable.api();
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/css/demo_mmenu.css
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/css/demo_mmenu.css
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/css/demo_mmenu.css
2016-02-22 22:17:34 UTC (rev 14769)
@@ -59,7 +59,7 @@
.header,
.footer
{
- background: #777;
+ background: #677;
font-size: 16px;
font-weight: bold;
color: #fff;
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/head.inc.php
2016-02-22 22:17:34 UTC (rev 14769)
@@ -63,7 +63,7 @@
{
$stylesheets[] =
"/phpgwapi/templates/pure/themes/{$GLOBALS['phpgw_info']['user']['preferences']['common']['theme']}.css";
}
- //$stylesheets[] = "/{$app}/templates/base/css/base.css";
+ $stylesheets[] = "/{$app}/templates/base/css/base.css";
//$stylesheets[] = "/{$app}/templates/portico/css/base.css";
if(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['theme']))
{
Modified: branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/phpgwapi/templates/pure/head.tpl
2016-02-22 22:17:34 UTC (rev 14769)
@@ -15,24 +15,6 @@
<!-- END stylesheet -->
{menu_stylesheet_widescreen}
-
- <style>
- .priority1
- {
- background-color: #da7a7a !important;
- }
-
- .priority2
- {
- background-color: #dababa !important;
- }
-
- .priority3
- {
- background-color: #dadada !important;
- }
- </style>
-
<script type="text/javascript">
<!--
var strBaseURL = '{str_base_url}';
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-02-22 22:17:34 UTC (rev 14769)
@@ -692,7 +692,9 @@
);
}
- // if($order_read)
+ $order_read = $this->acl->check('.ticket.order',
PHPGW_ACL_READ, 'property');
+
+ if($order_read)
{
$combos[] = array('type' => 'filter',
'name' => 'vendor_id',
@@ -1392,6 +1394,7 @@
'lang_send' => lang('send'),
'value_details' => (isset($values['details']) ?
$values['details'] : ''),
'value_subject' => (isset($values['subject']) ?
$values['subject'] : ''),
+ 'tts_mandatory_title' =>
$this->bo->config->config_data['tts_mandatory_title'],
'value_finnish_date' =>
(isset($values['finnish_date']) ? $values['finnish_date'] : ''),
'lang_finnish_date_statustext' => lang('Select
the estimated date for closing the task'),
'lang_cancel_statustext' => lang('Back to the
ticket list'),
Modified: branches/Version-2_0-branch/property/js/portico/tts.add.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/tts.add.js 2016-02-22
14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/property/js/portico/tts.add.js 2016-02-22
22:17:34 UTC (rev 14769)
@@ -48,8 +48,32 @@
},
failure: function (o)
{
- window.alert('failure - try again - once')
+ window.alert('failure - try again - once');
},
timeout: 5000
});
-}
+};
+$(document).ready(function ()
+{
+
+ $('#group_id').attr("data-validation",
"assigned").attr("data-validation-error-msg", lang['Please select a person or a
group to handle the ticket !']);
+ $('#user_id').attr("data-validation",
"assigned").attr("data-validation-error-msg", lang['Please select a person or a
group to handle the ticket !']);
+});
+
+$.formUtils.addValidator({
+ name: 'assigned',
+ validatorFunction: function (value, $el, config, languaje, $form)
+ {
+ var v = false;
+ var group_id = $('#group_id').val();
+ var user_id = $('#user_id').val();
+ if (group_id != "" || user_id != "")
+ {
+ v = true;
+ }
+ return v;
+ },
+ errorMessage: 'Assigned is required',
+ errorMessageKey: ''
+});
+
Modified: branches/Version-2_0-branch/property/templates/base/css/base.css
===================================================================
--- branches/Version-2_0-branch/property/templates/base/css/base.css
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/property/templates/base/css/base.css
2016-02-22 22:17:34 UTC (rev 14769)
@@ -1,3 +1,23 @@
+
+.priority1
+{
+/* background-color: #da7a7a !important;*/
+ background-color: #dababa !important;
+
+}
+
+.priority2
+{
+/* background-color: #dababa !important;*/
+ background-color: #dadada !important;
+
+}
+
+.priority3
+{
+
+}
+
/*
* Conflicts with portico
body, div, input, p, select, textarea
@@ -8,111 +28,111 @@
*/
a
{
- text-decoration: none;
+ text-decoration: none;
}
a:hover, a:active
{
- text-decoration: underline;
+ text-decoration: underline;
}
img
{
- border: 0px;
+ border: 0px;
}
textarea
{
- /* white-space: normal;*/
+ /* white-space: normal;*/
}
br
{
- clear: left;
+ clear: left;
}
thead
{
- background-color: #d3dce3;
- font-weight: bold;
- text-align: center;
+ background-color: #d3dce3;
+ font-weight: bold;
+ text-align: center;
}
.button_group
{
- text-align: center;
+ text-align: center;
}
.link_group
{
- text-align: center;
+ text-align: center;
}
.msg
{
- color: #f00;
- font-weight: bold;
- text-align: center;
+ color: #f00;
+ font-weight: bold;
+ text-align: center;
}
.yui-dt .yui-dt-hidden
{
- border-right:0px solid #ff0 !important;
+ border-right:0px solid #ff0 !important;
}
.yui-tt .bd
{
- background-color:#fffbeb !important;
- border-color:#D4C237 #A6982B #A6982B;
- border-width:0px !important;
- color:#000000 !important;
- left:0 !important;
- padding:0 !important;
- font-family: tahoma !important;
- font-size: 11px !important;
+ background-color:#fffbeb !important;
+ border-color:#D4C237 #A6982B #A6982B;
+ border-width:0px !important;
+ color:#000000 !important;
+ left:0 !important;
+ padding:0 !important;
+ font-family: tahoma !important;
+ font-size: 11px !important;
}
.tooltip-table
{
- width:200px !important;
+ width:200px !important;
}
.tooltip
{
- background-color:#0066cc !important;
- color:#FFFFFF !important;
- font-weight: bold !important;
- font-family: tahoma !important;
- font-size: 11px !important;
+ background-color:#0066cc !important;
+ color:#FFFFFF !important;
+ font-weight: bold !important;
+ font-family: tahoma !important;
+ font-size: 11px !important;
}
.nolink a
{
- color:#FFFFFF !important;
- text-decoration: none !important;
+ color:#FFFFFF !important;
+ text-decoration: none !important;
}
.nolink a visited
{
- color:#FFFFFF !important;
- text-decoration: none !important;
+ color:#FFFFFF !important;
+ text-decoration: none !important;
}
#curtain {
- background: none repeat scroll 0 0 #000000;
- display: none;
- height: 100%;
- left: 0;
- opacity: 0.5;
- position: absolute;
- top: 0;
- width: 100%;
- z-index: 1;
+ background: none repeat scroll 0 0 #000000;
+ display: none;
+ height: 100%;
+ left: 0;
+ opacity: 0.5;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 1;
}
#popupBox {
- background: none repeat scroll 0 0 #fff;
- display: none;
- height: 50%;
- left: 80px;
- position: absolute;
- top: 80px;
- width: 800px;
- z-index: 2;
+ background: none repeat scroll 0 0 #fff;
+ display: none;
+ height: 50%;
+ left: 80px;
+ position: absolute;
+ top: 80px;
+ width: 800px;
+ z-index: 2;
}
/*
@@ -123,287 +143,287 @@
#user_messages { float: right; width: 40%;}
div.content {
- margin: 2em;
+ margin: 2em;
}
.hd {
- margin-bottom: 0;
- text-align: center;
+ margin-bottom: 0;
+ text-align: center;
}
.hd img {
- vertical-align: middle;
+ vertical-align: middle;
}
fieldset {
- margin-top: 0.5em;
- border:1px solid #1E90FF;
+ margin-top: 0.5em;
+ border:1px solid #1E90FF;
}
legend {
- padding: 0.2em 0.5em;
- border:1px solid #1E90FF;
+ padding: 0.2em 0.5em;
+ border:1px solid #1E90FF;
/* color:#cccccc;*/
- font-size:90%;
- text-align:right;
- font-weight: bolder;
+ font-size:90%;
+ text-align:right;
+ font-weight: bolder;
}
label {
- font-size: 13px;
- font-weight: bold;
- margin-right: 5px;
- display: inline-block;
+ font-size: 13px;
+ font-weight: bold;
+ margin-right: 5px;
+ display: inline-block;
}
a{
- cursor: pointer;
+ cursor: pointer;
}
.row{
- padding: 0.3em 0;
+ padding: 0.3em 0;
}
h3 {
- font-size: 1.2em;
- font-weight: bold;
- margin: 1em 0;
+ font-size: 1.2em;
+ font-weight: bold;
+ margin: 1em 0;
}
#content {
- margin: 2em 1em;
+ margin: 2em 1em;
}
.clr { clear: both;}
#active {
- background-color: #ffffff;
- width: 10em;
- padding: 1em;
- border: 0em dotted #000000;
- letter-spacing: 2px;
+ background-color: #ffffff;
+ width: 10em;
+ padding: 1em;
+ border: 0em dotted #000000;
+ letter-spacing: 2px;
}
#inactivate-button {
- border: 1px solid #000000;
- margin-top: 1em;
- padding: 0.1em;
- background-color: #ffffff;
+ border: 1px solid #000000;
+ margin-top: 1em;
+ padding: 0.1em;
+ background-color: #ffffff;
}
#activate-button {
- border: 1px solid #000000;
- margin-top: 1em;
- padding: 0.1em;
- background-color: #ffffff;
+ border: 1px solid #000000;
+ margin-top: 1em;
+ padding: 0.1em;
+ background-color: #ffffff;
}
.breadcrumbs{
- margin-left: 20px;
+ margin-left: 20px;
}
ul.pathway {
- font-weight: bolder;
- margin: 1em 0;
- font-size: 110%;
+ font-weight: bolder;
+ margin: 1em 0;
+ font-size: 110%;
}
ul.pathway li a { color: #000; text-decoration: none;}
ul.pathway li a:hover { color: #008; }
ul.pathway li {
- display: inline;
- background: url(../images/pathwaysep.png) no-repeat 0% 50%;
- padding-left: 16px;
+ display: inline;
+ background: url(../images/pathwaysep.png) no-repeat 0% 50%;
+ padding-left: 16px;
}
ul.pathway li:first-child { background: none; padding-left: 0;}
dl.form, dl.form-col {
- margin: 1em 1em 1em 0;
+ margin: 1em 1em 1em 0;
}
dl.form dt, dl.form-col dt {
- font-style: italic;
- font-weight: bolder;
- margin: .5em 0 .1em 0;
- color: #002;
+ font-style: italic;
+ font-weight: bolder;
+ margin: .5em 0 .1em 0;
+ color: #002;
}
dl.form dd textarea,
dl.form-col dd textarea {
- width: 15em;
- height: 6em;
+ width: 15em;
+ height: 6em;
}
dl.form dd textarea.full-width,
dl.form-col dd textarea.full-width {
- width: 33em;
- height: 10em;
+ width: 33em;
+ height: 10em;
}
dl.form dd input[type="text"], dl.form dd .autocomplete,
dl.form-col dd input[type="text"], dl.form-col dd .autocomplete {
- width: 15em;
+ width: 15em;
}
dl.form dd .autocomplete,
dl.form-col dd .autocomplete,
dl.form-2col dd .autocomplete {
- padding-bottom: 2em;
+ padding-bottom: 2em;
}
div.autocomplete {
- width: 15em;
- position: relative;
- padding-bottom: 2em;
+ width: 15em;
+ position: relative;
+ padding-bottom: 2em;
}
/* ie fix. autocomplete dropdown is displayed behind some elements if the
z-index is not set */
div.autocomplete input {
- z-index: 500;
+ z-index: 500;
}
dl.form dt.heading, dl.form-col dt.heading {
- color: #448;
- font-weight: normal;
- font-size: 110%;
- margin-top: 1.4em;
- margin-bottom: .6em;
- border-bottom: 1px solid #aaa;
+ color: #448;
+ font-weight: normal;
+ font-size: 110%;
+ margin-top: 1.4em;
+ margin-bottom: .6em;
+ border-bottom: 1px solid #aaa;
}
dl.proplist,
dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
+ margin: 1em 0;
+ padding-left: 2em;
}
dl.proplist-col,
dl.form-col {
- /* width: 18em; */
- float: left;
+ /* width: 18em; */
+ float: left;
}
div.identifier-header {
- padding-left: 2em;
- margin-bottom: 1em;
+ padding-left: 2em;
+ margin-bottom: 1em;
}
div.identifier-header label {
- font-weight: bold;
+ font-weight: bold;
}
.form-buttons {
- clear: both;
- padding-top: 1em;
+ clear: both;
+ padding-top: 1em;
}
.form-buttons input[type=submit], input[type="button"]{
- margin-right: 5px;
+ margin-right: 5px;
}
.form-buttons button {
- margin-right: .5em;
+ margin-right: .5em;
}
.form-buttons .cancel {
- margin-left: .6em;
+ margin-left: .6em;
}
.date-picker .container,
.datetime-picker .container {
- display:none;
- position:absolute; z-index:1;
+ display:none;
+ position:absolute; z-index:1;
}
#datatableToolbar {
- background-color: white;
- margin-bottom: 0em;
- padding: .3em;
+ background-color: white;
+ margin-bottom: 0em;
+ padding: .3em;
}
table.datatableToolbar {
- padding: .3em;
+ padding: .3em;
}
#controller_user_error {
- width: 100%;
- background-color: #eee;
- border: 0px none #bbb;
- margin-bottom: 0em;
- padding-left: .3em;
- color: red;
- font-size: larger;
+ width: 100%;
+ background-color: #eee;
+ border: 0px none #bbb;
+ margin-bottom: 0em;
+ padding-left: .3em;
+ color: red;
+ font-size: larger;
}
#controller_user_message {
- width: 100%;
- background-color: #eee;
- border: 0px none #bbb;
- margin-bottom: 0em;
- padding-left: .3em;
- color: green;
- font-size: larger;
+ width: 100%;
+ background-color: #eee;
+ border: 0px none #bbb;
+ margin-bottom: 0em;
+ padding-left: .3em;
+ color: green;
+ font-size: larger;
}
.toolbarelement {
- vertical-align:middle;
+ vertical-align:middle;
}
td.toolbarlabel {
- width: 10em;
- font-weight: bold;
+ width: 10em;
+ font-weight: bold;
}
td.toolbarcol {
- padding-left: 1em;
+ padding-left: 1em;
}
div.calendarButtons {
- vertical-align:middle;
- background-color: grey;
+ vertical-align:middle;
+ background-color: grey;
}
label.toolbar_element_label {
- padding-left: .25em;
- padding-right: .50em;
- vertical-align: middle;
+ padding-left: .25em;
+ padding-right: .50em;
+ vertical-align: middle;
}
#toolbar input[type="text"] {
- font-size: 120%;
- margin: auto .25em;
+ font-size: 120%;
+ margin: auto .25em;
}
dl.proplist dd.address,
dl.proplist-col dd.address {
- white-space: pre;
+ white-space: pre;
}
.date-container {
- margin-bottom: .8em;
- white-space: nowrap;
+ margin-bottom: .8em;
+ white-space: nowrap;
}
div.nowrap {
- white-space: nowrap;
+ white-space: nowrap;
}
.date-container .close-btn {
- display: block;
- float: right;
- border: none;
- text-decoration: none;
- width: 25px;
- height: 15px;
- cursor: pointer;
- color: white;
+ display: block;
+ float: right;
+ border: none;
+ text-decoration: none;
+ width: 25px;
+ height: 15px;
+ cursor: pointer;
+ color: white;
}
div.allocation-list
{
- width: 30em;
- height: 10em;
- border: 1px solid #555;
- padding: .4em;
- overflow: auto;
+ width: 30em;
+ height: 10em;
+ border: 1px solid #555;
+ padding: .4em;
+ overflow: auto;
}
.showit {
- visibility: visible;
+ visibility: visible;
}
.hideit {
- visibility: hidden;
+ visibility: hidden;
}
.datatable{
- margin-left: 20px;
- margin-top: 10px;
+ margin-left: 20px;
+ margin-top: 10px;
}
/* Styles for this the column selector */
@@ -418,69 +438,69 @@
#dt-dlg .dt-dlg-pickerbtns {float:right;}
/* Container workarounds for Mac Gecko scrollbar issues */
.yui-panel-container.hide-scrollbars #dt-dlg .bd {
- /* Hide scrollbars by default for Gecko on OS X */
- overflow: hidden;
+ /* Hide scrollbars by default for Gecko on OS X */
+ overflow: hidden;
}
.yui-panel-container.show-scrollbars #dt-dlg .bd {
- /* Show scrollbars for Gecko on OS X when the Panel is visible */
- overflow: auto;
+ /* Show scrollbars for Gecko on OS X when the Panel is visible */
+ overflow: auto;
}
#dt-dlg_c .underlay {overflow:hidden;}
.inprogress {position:absolute;} /* transitional progressive enhancement state
*/
dl.controller-description {
- width: 70%;
+ width: 70%;
}
dl.controller-description dt, dl.controller-description-edit {
- width: 100%;
- float:left;
- font-weight:bold;
+ width: 100%;
+ float:left;
+ font-weight:bold;
}
dl.controller-description dd {
- width: 100%;
- border: 1px solid #ccc;
- float: left;
- background-color: white;
- height: 100px;
- overflow-y: scroll;
+ width: 100%;
+ border: 1px solid #ccc;
+ float: left;
+ background-color: white;
+ height: 100px;
+ overflow-y: scroll;
}
dl.controller-description-edit textarea {
- width: 100%;
- height: 100px;
- border: 1px solid #ccc;
- float: left;
+ width: 100%;
+ height: 100px;
+ border: 1px solid #ccc;
+ float: left;
}
input#place {
- width:60%;
+ width:60%;
}
input#address_1 {
- width: 60%;
- float:left;
+ width: 60%;
+ float:left;
}
input#house_number {
- width: 20%;
- float: left;
+ width: 20%;
+ float: left;
}
input.postcode {
- width: 50px;
- float: left;
+ width: 50px;
+ float: left;
}
.yui-navset {
- clear: both;
- margin-left: 2em;
- margin-right: 2em;
+ clear: both;
+ margin-left: 2em;
+ margin-right: 2em;
}
h1 img, li img {
- vertical-align: middle;
+ vertical-align: middle;
}
/* Set up common form styles. TODO: needs refinement. */
@@ -491,102 +511,102 @@
/* ========================================== SELECTORS, IDS AND CLASSES
=========================================== */
input[type="radio"] {
- margin: 0 5px 0 2px;
- padding: 3px 6px;
+ margin: 0 5px 0 2px;
+ padding: 3px 6px;
}
input[type="checkbox"] {
- margin: 5px;
+ margin: 5px;
}
input[type="text"] {
- padding: 5px 5px 2px;
+ padding: 5px 5px 2px;
}
select {
- padding: 4px;
+ padding: 4px;
}
fieldset {
- border-bottom:0px solid #ccc;
+ border-bottom:0px solid #ccc;
}
textarea{
- padding: 4px;
+ padding: 4px;
}
h1 em {
- font-style:italic;
+ font-style:italic;
}
a {
- color: #0066CC;
- text-decoration: none;
+ color: #0066CC;
+ text-decoration: none;
}
#innertoolbar-button, input[type="submit"], input[type="button"]{
- background: none repeat scroll 0 0 #4F9AEA;
- border: 1px solid #4685C8;
- border-radius: 4px 4px 4px 4px;
- color: #FFFFFF;
- cursor: pointer;
- padding: 3px 15px;
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #4685C8;
+ border-radius: 4px 4px 4px 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ padding: 3px 15px;
}
input[type="submit"][disabled]
{
- background: none repeat scroll 0 0 #A3D1FF;
+ background: none repeat scroll 0 0 #A3D1FF;
}
#innertoolbar-button {
- font-size: 1em;
- line-height: 1.2em;
- min-height: 1.2em;
- padding: 2px 15px;
+ font-size: 1em;
+ line-height: 1.2em;
+ min-height: 1.2em;
+ padding: 2px 15px;
}
a#innertoolbar-button {
- padding: 3px 15px;
+ padding: 3px 15px;
}
.row input[type="submit"] {
- padding: 2px 10px;
+ padding: 2px 10px;
}
.info, .error, .warning {
- font-weight: normal;
- margin:20px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
+ font-weight: normal;
+ margin:20px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
}
.message {
- margin: 5px;
+ margin: 5px;
}
.info {
- background-color:#CCFFCC;
- border:1px solid #00FF00;
- color:black;
+ background-color:#CCFFCC;
+ border:1px solid #00FF00;
+ color:black;
}
.warning {
- background-color: #FEEFB3;
- border:1px solid #9F6000;
- color:#9F6000;
+ background-color: #FEEFB3;
+ border:1px solid #9F6000;
+ color:#9F6000;
}
.yui-calendar td.calcell {
- border:0px !important;
+ border:0px !important;
}
.yui-skin-sam .yui-dt TABLE TH{
- border: none !important;
+ border: none !important;
}
.yui-skin-sam .yui-dt TABLE TD{
- border: none !important;
+ border: none !important;
}
/*
@@ -602,778 +622,778 @@
}
*/
.datatable_container {
- margin-left: 1em;
- margin-top: 1em;
+ margin-left: 1em;
+ margin-top: 1em;
}
.paginator {
- margin-left: 1em !important;
+ margin-left: 1em !important;
}
dd ol li {
- list-style: decimal;
- list-style-position: inside;
+ list-style: decimal;
+ list-style-position: inside;
}
dd ul li {
- list-style: disc;
- list-style-position: inside;
+ list-style: disc;
+ list-style-position: inside;
}
h1 img{
- margin-right:5px;
+ margin-right:5px;
}
.yui-content h2{
- margin:0 0 10px;
+ margin:0 0 10px;
}
/* ======================================= EXPAND LIST
========================================= */
ul.expand_list h4 {
- cursor: pointer;
- font-size: 1.1em;
- margin-bottom: 6px;
- margin-top: 0;
+ cursor: pointer;
+ font-size: 1.1em;
+ margin-bottom: 6px;
+ margin-top: 0;
}
ul.expand_list h4 img {
- height: 12px;
+ height: 12px;
}
ul.expand_list li ul {
- display:none;
- margin-left:21px;
+ display:none;
+ margin-left:21px;
}
ul.expand_list li ul li {
- margin-bottom: 3px;
- padding: 3px;
+ margin-bottom: 3px;
+ padding: 3px;
}
ul.expand_list h4 span {
- padding-left: 5px;
- vertical-align: middle;
+ padding-left: 5px;
+ vertical-align: middle;
}
ul.expand_list .expand_item {
- display: none;
+ display: none;
}
dl.proplist, dl.proplist-col {
- margin: 0;
- padding-left: 0;
- width: 50%;
+ margin: 0;
+ padding-left: 0;
+ width: 50%;
}
#details .proplist dd, #details .proplist-col dd{
- margin-bottom: 0.5em;
+ margin-bottom: 0.5em;
}
.frm_save_order input[type='submit']{
- margin: 10px 0 15px 0;
- width: 120px;
+ margin: 10px 0 15px 0;
+ width: 120px;
}
.delete {
- cursor: pointer;
- margin-left: 5px;
+ cursor: pointer;
+ margin-left: 5px;
}
.yui-navset .yui-content.tab_content {
- padding: 20px;
+ padding: 20px;
}
#datatable-container {
- margin: 20px;
+ margin: 20px;
}
#paginator {
- margin: 20px;
+ margin: 20px;
}
#paginator.top {
- margin: 20px 0 0 20px;
+ margin: 20px 0 0 20px;
}
#toolbar {
- display: inline-block;
- padding: 10px 0;
+ display: inline-block;
+ padding: 10px 0;
}
#toolbar input[type="text"] {
- font-size: 100%;
- padding: 3px;
+ font-size: 100%;
+ padding: 3px;
}
#toolbar input[type="submit"] {
- padding:0 8px;
- margin-top:0;
+ padding:0 8px;
+ margin-top:0;
}
.yui-button.yui-link-button.new_button{
- margin-left:30px;
+ margin-left:30px;
}
#view_check_lists {
- padding: 30px;
- width: 600px;
+ padding: 30px;
+ width: 600px;
}
ul.th {
- font-weight: bold;
- overflow:hidden;
+ font-weight: bold;
+ overflow:hidden;
}
ul.th li {
- float: left;
- margin-right: 20px;
- padding: 3px 6px;
- width: 100px;
+ float: left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
}
ul.row{
- overflow: hidden;
+ overflow: hidden;
}
ul.row li{
- float:left;
- margin-right: 20px;
- padding: 3px 6px;
- width: 100px;
+ float:left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
}
/* ======================================= GENERAL CLASSES
========================================= */
.box {
- background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #eee;
- margin-bottom: 20px;
- padding: 15px;
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #eee;
+ margin-bottom: 20px;
+ padding: 15px;
}
.box.ext {
- background: none repeat scroll 0 0 #FEFBF7;
- border: 1px solid #FEEDEA;
+ background: none repeat scroll 0 0 #FEFBF7;
+ border: 1px solid #FEEDEA;
}
.box_header {
- background: none repeat scroll 0 0 #CFE6FF;
- border-color: #C7DCF2;
- border-style: solid;
- border-width: 1px 1px 0;
- color: #444444;
- font-size: 13px;
- font-weight: bold;
- margin: 0;
- padding: 6px 0 6px 15px;
- text-align: left;
+ background: none repeat scroll 0 0 #CFE6FF;
+ border-color: #C7DCF2;
+ border-style: solid;
+ border-width: 1px 1px 0;
+ color: #444444;
+ font-size: 13px;
+ font-weight: bold;
+ margin: 0;
+ padding: 6px 0 6px 15px;
+ text-align: left;
}
.box_header.ext {
- background: none repeat scroll 0 0 #F57056;
- border-color: #EB9685;
- color: #FFFFFF;
+ background: none repeat scroll 0 0 #F57056;
+ border-color: #EB9685;
+ color: #FFFFFF;
}
.btn, .btn_m, .btn-sm {
- background: none repeat scroll 0 0 #4F9AEA;
- border: 1px solid #428AD7;
- border-radius: 4px;
- color: #FFFFFF;
- cursor: pointer;
- display: inline-block;
- padding: 5px 10px;
- text-decoration: none;
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #428AD7;
+ border-radius: 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ display: inline-block;
+ padding: 5px 10px;
+ text-decoration: none;
}
.btn_m{
- padding: 2px 6px;
- font-size: 12px;
+ padding: 2px 6px;
+ font-size: 12px;
}
.btn-sm {
- font-size: 12px;
- padding: 1px 4px;
- text-align: center;
+ font-size: 12px;
+ padding: 1px 4px;
+ text-align: center;
}
.btn.cancel, .btn_m.cancel, .btn-sm.cancel {
- background: none repeat scroll 0 0 #EEEEEE;
- border: 1px solid #CCCCCC;
- color: #333333;
+ background: none repeat scroll 0 0 #EEEEEE;
+ border: 1px solid #CCCCCC;
+ color: #333333;
}
.btn.non-focus {
- background: none repeat scroll 0 0 #A0C8F2;
- border: 1px solid #74B0EF;
- color: #0A3E74;
+ background: none repeat scroll 0 0 #A0C8F2;
+ border: 1px solid #74B0EF;
+ color: #0A3E74;
}
.btn.focus, .btn_m.focus {
- background: none repeat scroll 0 0 #F57056;
- border-color: #EE836F #CB563F #CB563F;
- border-style: solid none;
- border-width: 1px 0;
- color: #FFFFFF;
- margin-top: 1px;
+ background: none repeat scroll 0 0 #F57056;
+ border-color: #EE836F #CB563F #CB563F;
+ border-style: solid none;
+ border-width: 1px 0;
+ color: #FFFFFF;
+ margin-top: 1px;
}
/* ======================================= MAIN CONTENT
========================================= */
#main_content {
- padding: 20px;
- width: 1150px;
+ padding: 20px;
+ width: 1150px;
}
#main_content.groups{
- cursor: default;
+ cursor: default;
}
#main_content h1{
- margin-top:0;
+ margin-top:0;
}
.content-wrp {
- background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #DEE1E4;
- margin-top: 1em;
- padding: 0;
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #DEE1E4;
+ margin-top: 1em;
+ padding: 0;
}
.content-wrp .yui-skin-sam .yui-dt table {
- border: 1px solid #CCCCCC;
+ border: 1px solid #CCCCCC;
}
/* ======================================= CHECK LIST DETAILS
========================================= */
input.id {
- background: none repeat scroll 0 0 #FFFFFF;
- border: 1px solid #DDDDDD;
- text-align: right;
- width: 50px;
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #DDDDDD;
+ text-align: right;
+ width: 50px;
}
input.date {
- text-align: right;
- width: 80px;
+ text-align: right;
+ width: 80px;
}
input.datetime {
- text-align: right;
- width: 110px;
+ text-align: right;
+ width: 110px;
}
/* ======================================= TAB CHECK LIST DETAILS
========================================= */
.tab_check_list_details label {
- display: inline-block;
- font-weight: bold;
- width: 100px;
+ display: inline-block;
+ font-weight: bold;
+ width: 100px;
}
fieldset.tab_check_list_details {
- padding: 0 0 10px 0;
+ padding: 0 0 10px 0;
}
.form-buttons-top{
- float: right;
- margin-bottom:5px;
+ float: right;
+ margin-bottom:5px;
}
.form-buttons-top input[type="submit"]{
- margin:0;
+ margin:0;
}
#frm_save_check_items h1 {
- float: left;
- margin: 5px;
+ float: left;
+ margin: 5px;
}
ul.check_list {
- width: 925px;
+ width: 925px;
}
/* ============================= SEARCH LOCATION BOX =======================
*/
#search-location {
- float: right;
- margin-bottom: 10px;
+ float: right;
+ margin-bottom: 10px;
}
#search-location-name {
- margin: 2px 0 0;
- width: 16em;
+ margin: 2px 0 0;
+ width: 16em;
}
#choose-my-location {
- float: right;
- margin-right: 10px;
+ float: right;
+ margin-right: 10px;
}
#choose-building {
- float: left;
+ float: left;
}
#filters {
- clear: left;
- float: left;
+ clear: left;
+ float: left;
}
.select-box {
- background: none repeat scroll 0 0 #FEFBF4;
- border: 1px solid #DDDDDD;
- border-radius: 4px;
- padding: 1em;
+ background: none repeat scroll 0 0 #FEFBF4;
+ border: 1px solid #DDDDDD;
+ border-radius: 4px;
+ padding: 1em;
}
.select-box label{
- margin-bottom:5px;
- display: block;
+ margin-bottom:5px;
+ display: block;
}
.select-box a{
- display: block;
- font-weight: bold;
- padding: 0 0 10px;
- text-align: justify;
+ display: block;
+ font-weight: bold;
+ padding: 0 0 10px;
+ text-align: justify;
}
.select-box a.last{
- padding: 0;
+ padding: 0;
}
#choose-loc .btn {
- display: inline-block;
- font-size: 0.9em;
- padding: 2px 8px;
+ display: inline-block;
+ font-size: 0.9em;
+ padding: 2px 8px;
}
#choose-loc .btn.first {
- margin-right: 0.3em;
+ margin-right: 0.3em;
}
#choose-loc .btn.active{
- background: #3F7EC1;
+ background: #3F7EC1;
}
#choose-loc label {
- display: inline-block;
+ display: inline-block;
}
.yui-pg-first{
- margin-left: 14px;
- margin-top: 5px;
+ margin-left: 14px;
+ margin-top: 5px;
}
#data_paginator, #loc_paginator{
- margin:8px;
- clear:left;
+ margin:8px;
+ clear:left;
}
ul#filters li, ul#search_list li{
- float:left;
+ float:left;
}
ul#filters input[type="text"], ul#filters select {
- margin-right: 5px;
- padding: 3px;
+ margin-right: 5px;
+ padding: 3px;
}
#choose_control select {
- float: left;
- margin-right: 5px;
+ float: left;
+ margin-right: 5px;
}
#choose_control form {
- float: left;
+ float: left;
}
ul#search_list input[type="submit"] {
- margin: 0;
- padding: 2px 15px;
+ margin: 0;
+ padding: 2px 15px;
}
ul#search_list input[type="text"] {
- margin: 0 5px 0 0;
- padding: 3px;
+ margin: 0 5px 0 0;
+ padding: 3px;
}
#queryForm {
- clear: both;
- margin: 20px;
- overflow: hidden;
+ clear: both;
+ margin: 20px;
+ overflow: hidden;
}
fieldset.add_check_list div{
- padding:2px;
+ padding:2px;
}
fieldset.add_check_list label{
- display:inline-table;
- width:120px;
+ display:inline-table;
+ width:120px;
}
label.comment{
- vertical-align:top;
+ vertical-align:top;
}
/* ======================== TAB MENU ========================== */
.tab_menu a {
- background: none repeat scroll 0 0 #F9F5F0;
- border: 1px solid #F0F0F0;
- color: #444444;
- display: inline-block;
- font-weight: bold;
- margin-right: 3px;
- padding: 6px 0;
- text-align: center;
- text-decoration: none;
- width: 150px;
+ background: none repeat scroll 0 0 #F9F5F0;
+ border: 1px solid #F0F0F0;
+ color: #444444;
+ display: inline-block;
+ font-weight: bold;
+ margin-right: 3px;
+ padding: 6px 0;
+ text-align: center;
+ text-decoration: none;
+ width: 150px;
}
.tab_menu a.active {
- background: none repeat scroll 0 0 #CAE3FB;
- border: 1px solid #CAE3FB;
- font-weight: bold;
+ background: none repeat scroll 0 0 #CAE3FB;
+ border: 1px solid #CAE3FB;
+ font-weight: bold;
}
.tab_menu a, .tab_menu a.active{
- border-bottom: 0;
+ border-bottom: 0;
}
#tab_content {
- background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #DBE5EF;
- padding: 0 20px 20px;
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #DBE5EF;
+ padding: 0 20px 20px;
}
/* =================================== TAB ITEM
================================= */
.tab_item {
- background: none repeat scroll 0 0 #F7FAFF;
- border: 1px solid #DAE2EE;
- padding: 15px;
+ background: none repeat scroll 0 0 #F7FAFF;
+ border: 1px solid #DAE2EE;
+ padding: 15px;
}
.tab_item.ext {
- background: none repeat scroll 0 0 #FEFBF7;
- border: 1px solid #FEEDEA;
+ background: none repeat scroll 0 0 #FEFBF7;
+ border: 1px solid #FEEDEA;
}
.tab_item h2 {
- background: none repeat scroll 0 0 #DAE3EB;
- font-size: 14px;
- margin: 0 0 10px;
- padding: 3px 6px;
+ background: none repeat scroll 0 0 #DAE3EB;
+ font-size: 14px;
+ margin: 0 0 10px;
+ padding: 3px 6px;
}
.tab_item h2.last{
- margin:20px 0 10px;
+ margin:20px 0 10px;
}
#main_content fieldset.location_details{
- background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #CCCCCC;
- padding: 15px;
- float:left;
- border: 1px solid #ddd;
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #CCCCCC;
+ padding: 15px;
+ float:left;
+ border: 1px solid #ddd;
}
fieldset.location_details div{
- margin:10px 0;
+ margin:10px 0;
}
#curtain {
- background: none repeat scroll 0 0 #000000;
- display: none;
- height: 100%;
- left: 0;
- opacity: 0.6;
- position: fixed;
- top: 0;
- width: 100%;
- z-index: 1;
+ background: none repeat scroll 0 0 #000000;
+ display: none;
+ height: 100%;
+ left: 0;
+ opacity: 0.6;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ z-index: 1;
}
#popupBox {
- background: none repeat scroll 0 0 #FFFFFF;
- display: none;
- left: 50%;
- position: absolute;
- top: 30%;
- width: 500px;
- margin-left: -250px;
- z-index: 2;
+ background: none repeat scroll 0 0 #FFFFFF;
+ display: none;
+ left: 50%;
+ position: absolute;
+ top: 30%;
+ width: 500px;
+ margin-left: -250px;
+ z-index: 2;
}
/* ================================== CHECK LIST
================================== */
#main_content.medium {
- overflow: hidden;
- width: 900px;
+ overflow: hidden;
+ width: 900px;
}
/* ==================================== CASE DETAILS
============================== */
#error_message_menu {
- float: left;
- margin-top: 50px;
+ float: left;
+ margin-top: 50px;
}
#error_message_menu a {
- text-align: center;
- width: 140px;
- margin: 2px 0;
- display:block;
+ text-align: center;
+ width: 140px;
+ margin: 2px 0;
+ display:block;
}
#register_errors_content {
- float: right;
- margin-top: 20px;
+ float: right;
+ margin-top: 20px;
}
/* =============================== FORM REGISTER CASE
============================= */
.frm_register_case {
- margin-bottom: 1em;
+ margin-bottom: 1em;
}
.frm_register_case input[type="text"]{
- width: 170px;
+ width: 170px;
}
.frm_register_case select {
- width: 184px;
+ width: 184px;
}
.frm_register_case textarea {
- display: block;
- height: 100px;
- margin-top: 6px;
- margin-bottom: 1em;
- width: 63%;
+ display: block;
+ height: 100px;
+ margin-top: 6px;
+ margin-bottom: 1em;
+ width: 63%;
}
.frm_register_case label {
- display: inline-block;
- width: 18%;
+ display: inline-block;
+ width: 18%;
}
#queryForm #choose-location {
- margin: 0;
+ margin: 0;
}
#choose-location h4{
- display: block;
- font-size: 17px;
- margin: 5px 0;
+ display: block;
+ font-size: 17px;
+ margin: 5px 0;
}
#comp-filters label {
- font-size: 1em;
- font-weight: bold;
+ font-size: 1em;
+ font-weight: bold;
}
#comp-filters .select-box {
- background: none repeat scroll 0 0 #DEEAF8;
- border: 1px solid #BDD3ED;
- float: left;
- height: 40px;
- margin-right: 5px;
+ background: none repeat scroll 0 0 #DEEAF8;
+ border: 1px solid #BDD3ED;
+ float: left;
+ height: 40px;
+ margin-right: 5px;
}
#comp-filters .filter {
- float: left;
+ float: left;
}
#choose-location #datatable-container{
- margin: 20px 0;
+ margin: 20px 0;
}
#data_paginator .error_msg{
- margin-left:20px;
+ margin-left:20px;
}
#locations-container{
- margin:20px;
+ margin:20px;
}
#select_all {
- float: right;
- margin-right: 805px;
+ float: right;
+ margin-right: 805px;
}
#save_location {
- margin-left:20px;
- margin-bottom:20px;
+ margin-left:20px;
+ margin-bottom:20px;
}
/* ============================= IMAGE LOADER ======================= */
img#loading {
- margin-left: 5px;
- vertical-align: middle;
+ margin-left: 5px;
+ vertical-align: middle;
}
#exec-print {
- margin:20px 0 0 40px;
+ margin:20px 0 0 40px;
}
#yui-history-iframe {
- position:absolute;
- top:0;
- left:0;
- width:1px;
- height:1px;
- visibility:hidden;
+ position:absolute;
+ top:0;
+ left:0;
+ width:1px;
+ height:1px;
+ visibility:hidden;
}
#control_group_id {
- width: 250px;
+ width: 250px;
}
#select-wrp {
- margin: 10px;
- padding: 10px;
- width: 25%;
+ margin: 10px;
+ padding: 10px;
+ width: 25%;
}
#control_location #queryForm{
- margin: 20px;
- width: 65%;
+ margin: 20px;
+ width: 65%;
}
table.yui-skin-sam {
- border: 0;
- padding: 0;
- margin: 0;
+ border: 0;
+ padding: 0;
+ margin: 0;
}
#details table{
- padding: 10px;
- margin: 10px;
- text-align: left;
- margin-left: 1em;
+ padding: 10px;
+ margin: 10px;
+ text-align: left;
+ margin-left: 1em;
}
#details table td{
- text-align: left;
- padding-right: 10px;
+ text-align: left;
+ padding-right: 10px;
}
.yui-skin-sam td.auto{
- width: 160px;
+ width: 160px;
}
.yui-skin-sam div.auto{
- width: 140px;
+ width: 140px;
}
.yui-skin-sam thead{
- background: none;
+ background: none;
}
p.no_items_msg {
- padding: 5px;
+ padding: 5px;
}
.no-comp-msg {
- font-size: 16px;
- padding-left: 12px;
+ font-size: 16px;
+ padding-left: 12px;
}
.option-list-heading {
- margin: 0 0 10px;
+ margin: 0 0 10px;
}
.option-list{
- margin-top: 5px;
+ margin-top: 5px;
}
.option-list{
- padding-left:10px;
+ padding-left:10px;
}
.option-list li{
- margin-bottom: 5px;
+ margin-bottom: 5px;
}
.input_error_msg {
- background: none repeat scroll 0 0 #FBE3E4;
- border-bottom-right-radius: 4px;
- color: #D12F19;
- display: block;
- margin-bottom: 5px;
- margin-top: 5px;
- padding: 5px;
- text-align: center;
- width: 90%;
+ background: none repeat scroll 0 0 #FBE3E4;
+ border-bottom-right-radius: 4px;
+ color: #D12F19;
+ display: block;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ padding: 5px;
+ text-align: center;
+ width: 90%;
}
.error_msg {
- color: red;
- display: none;
- font-size: 14px;
- padding: 7px 0;
+ color: red;
+ display: none;
+ font-size: 14px;
+ padding: 7px 0;
}
.help_text {
- background: none repeat scroll 0 0 #CCDBED;
- color: #414851;
- display: none;
- padding: 6px 10px 5px;
- text-align: center;
- vertical-align: baseline;
+ background: none repeat scroll 0 0 #CCDBED;
+ color: #414851;
+ display: none;
+ padding: 6px 10px 5px;
+ text-align: center;
+ vertical-align: baseline;
}
.help_text.line {
- margin-left: 5px;
+ margin-left: 5px;
}
.help_text.below {
- margin-left: 0;
- width: 505px;
+ margin-left: 0;
+ width: 505px;
}
.yui-navset .content-wrp {
- margin-top: 0;
+ margin-top: 0;
}
.fields_wrp {
- padding: 15px;
+ padding: 15px;
}
.fields_wrp td {
- padding: 7px 0;
- vertical-align: top;
+ padding: 7px 0;
+ vertical-align: top;
}
.fields_wrp td.first {
- padding-right: 5px;
- text-align: left;
- width: 250px;
+ padding-right: 5px;
+ text-align: left;
+ width: 250px;
}
.fields_wrp label {
- font-size: 13px;
- font-weight: normal;
- line-height: 1.5em;
+ font-size: 13px;
+ font-weight: normal;
+ line-height: 1.5em;
}
.fields_wrp h2 {
- font-size: 20px;
- margin: 0;
+ font-size: 20px;
+ margin: 0;
}
.fields_wrp textarea {
- width: 250px;
+ width: 250px;
}
.autocomplete ul{
- background: none repeat scroll 0 0 #FFFFFF;
- border: 1px solid #AEC6E3;
- position:absolute;
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #AEC6E3;
+ position:absolute;
}
.autocomplete li{
- background: none repeat scroll 0 0 #D4E1F8;
- list-style: none outside none;
- margin: 2px;
- padding: 4px 8px;
- cursor: pointer;
+ background: none repeat scroll 0 0 #D4E1F8;
+ list-style: none outside none;
+ margin: 2px;
+ padding: 4px 8px;
+ cursor: pointer;
}
.yui-skin-sam .autocomplete .yui-ac-content {
Modified: branches/Version-2_0-branch/property/templates/base/location_form2.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/location_form2.xsl
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/property/templates/base/location_form2.xsl
2016-02-22 22:17:34 UTC (rev 14769)
@@ -29,7 +29,7 @@
<xsl:value-of select="statustext"/>
</xsl:attribute>
<xsl:attribute
name="data-validation">
-
<xsl:text>number</xsl:text>
+
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="data-validation-error-msg">
<xsl:value-of
select="php:function('lang', 'Please select a location !')"/>
Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2016-02-22
14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2016-02-22
22:17:34 UTC (rev 14769)
@@ -19,6 +19,7 @@
self.name="first_Window";
<xsl:value-of select="lookup_functions"/>
var my_groups = <xsl:value-of select="my_groups"/>;
+ var lang = <xsl:value-of select="php:function('js_lang',
'Please select a person or a group to handle the ticket !')"/>;
</script>
<dl>
@@ -156,12 +157,14 @@
<xsl:attribute
name="title">
<xsl:value-of
select="php:function('lang', 'Enter the subject of this ticket')"/>
</xsl:attribute>
- <xsl:attribute
name="data-validation">
-
<xsl:text>required</xsl:text>
- </xsl:attribute>
- <xsl:attribute
name="data-validation-error-msg">
- <xsl:value-of
select="php:function('lang', 'Please enter a title !')"/>
- </xsl:attribute>
+ <xsl:if
test="tts_mandatory_title != ''">
+ <xsl:attribute
name="data-validation">
+
<xsl:text>required</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'Please enter a title !')"/>
+ </xsl:attribute>
+ </xsl:if>
</input>
</div>
Modified: branches/Version-2_0-branch/property/templates/base/user_id_select.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/user_id_select.xsl
2016-02-22 14:57:36 UTC (rev 14768)
+++ branches/Version-2_0-branch/property/templates/base/user_id_select.xsl
2016-02-22 22:17:34 UTC (rev 14769)
@@ -7,7 +7,7 @@
<xsl:variable name="select_user_name">
<xsl:value-of select="select_user_name"/>
</xsl:variable>
- <select name="{$select_user_name}" class="forms"
title="{$lang_user_statustext}"
onMouseover="window.status='{$lang_user_statustext}'; return true;"
onMouseout="window.status='';return true;">
+ <select name="{$select_user_name}" id="user_id" class="forms"
title="{$lang_user_statustext}">
<option value="">
<xsl:value-of select="lang_no_user"/>
</option>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14769] Merge 14765:14768 from trunk,
Sigurd Nes <=