[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10464]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10464] |
|
Date: |
Mon, 05 Nov 2012 07:46:43 +0000 |
Revision: 10464
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10464
Author: vator
Date: 2012-11-05 07:46:42 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/inc/class.uiproject.inc.php
trunk/logistic/inc/class.uirequirement.inc.php
trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
trunk/logistic/inc/class.uiresource_type_requirement.inc.php
trunk/logistic/setup/phpgw_no.lang
trunk/logistic/templates/base/activity/view_activity_item.xsl
trunk/logistic/templates/base/css/base.css
trunk/logistic/templates/base/requirement/requirement_overview.xsl
Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-05 07:21:19 UTC (rev
10463)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-05 07:46:42 UTC (rev
10464)
@@ -118,7 +118,7 @@
'field' => array(
array(
'key' => 'id',
- 'label' => lang('ID'),
+ 'label' => lang('Id'),
'sortable' => true,
'formatter' =>
'YAHOO.portico.formatLink'
),
@@ -580,7 +580,7 @@
),*/
array(
'key' => 'id',
- 'label' => lang('ID'),
+ 'label' => lang('Id'),
'sortable' => true,
),
array(
Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php 2012-11-05 07:21:19 UTC (rev
10463)
+++ trunk/logistic/inc/class.uiproject.inc.php 2012-11-05 07:46:42 UTC (rev
10464)
@@ -215,7 +215,7 @@
'field' => array(
array(
'key' => 'id',
- 'label' => lang('ID'),
+ 'label' => lang('Id'),
'sortable' => true,
'formatter' =>
'YAHOO.portico.formatLink'
),
@@ -336,7 +336,7 @@
'field' => array(
array(
'key' => 'id',
- 'label' =>
lang('ID'),
+ 'label' =>
lang('Id'),
'sortable' =>
true,
'formatter' =>
'YAHOO.portico.formatLink'
),
Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php 2012-11-05 07:21:19 UTC
(rev 10463)
+++ trunk/logistic/inc/class.uirequirement.inc.php 2012-11-05 07:46:42 UTC
(rev 10464)
@@ -243,7 +243,7 @@
),
array(
'key' => 'id',
- 'label' => lang('ID'),
+ 'label' => lang('Id'),
'sortable' => true,
),
array(
Modified: trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-11-05 07:21:19 UTC (rev 10463)
+++ trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-11-05 07:46:42 UTC (rev 10464)
@@ -131,7 +131,7 @@
'field' => array(
array(
'key' => 'id',
- 'label' => lang('ID'),
+ 'label' => lang('Id'),
'sortable' => true,
),
array(
Modified: trunk/logistic/inc/class.uiresource_type_requirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uiresource_type_requirement.inc.php
2012-11-05 07:21:19 UTC (rev 10463)
+++ trunk/logistic/inc/class.uiresource_type_requirement.inc.php
2012-11-05 07:46:42 UTC (rev 10464)
@@ -198,14 +198,14 @@
'field' => array(
array(
'key' => 'id',
- 'label' => lang('ID'),
+ 'label' => lang('Id'),
'sortable' => false,
'hidden' => true,
'formatter' =>
'YAHOO.portico.formatLink'
),
array(
'key' => 'location_id',
- 'label' => lang('ID'),
+ 'label' => lang('Id'),
'sortable' => true,
'formatter' =>
'YAHOO.portico.formatLink'
),
Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang 2012-11-05 07:21:19 UTC (rev 10463)
+++ trunk/logistic/setup/phpgw_no.lang 2012-11-05 07:46:42 UTC (rev 10464)
@@ -8,7 +8,7 @@
Project name logistic no Navn
Project type logistic no Type
Project description logistic no Beskrivelse
-ID logistic no ID
+ID logistic no Id
t_new_project logistic no Nytt prosjekt
t_new_project_type logistic no Ny prosjekttype
t_new_activity logistic no Opprett ny aktivitet på dette prosjektet
Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-05 07:21:19 UTC (rev 10463)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl
2012-11-05 07:46:42 UTC (rev 10464)
@@ -189,6 +189,7 @@
<h3 style="clear:left; float:left;margin: 0;
padding: 10px 0 5px;">Underaktiviteter</h3>
<a id="add-sub-activity-btn" class="btn focus"
href="{$add_sub_activity_url}"><xsl:value-of select="php:function('lang', 'Add
sub activity')" /></a>
+
<div style="clear:both;"
id="sub-activities-container"></div>
<xsl:call-template name="datasource-definition"
/>
</div>
@@ -207,7 +208,7 @@
type: 'children',
phpgw_return_as: 'json'
};
-
+
var requestUrl = phpGWLink('index.php', oArgs, true);
var myColumnDefs = [
@@ -219,7 +220,8 @@
{key:"status", label:'Status', sortable:true},
];
- YAHOO.portico.inlineTableHelper('sub-activities-container',
requestUrl, myColumnDefs);
+ YAHOO.portico.inlineTableHelper("sub-activities-container",
requestUrl, myColumnDefs);
+
});
</script>
</xsl:template>
Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css 2012-11-05 07:21:19 UTC (rev
10463)
+++ trunk/logistic/templates/base/css/base.css 2012-11-05 07:46:42 UTC (rev
10464)
@@ -873,12 +873,12 @@
}
.btn.focus, .btn_m.focus {
- background: none repeat scroll 0 0 #F57056;
- border-color: #EE836F -moz-use-text-color #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
========================================= */
@@ -2403,11 +2403,11 @@
}
#sub-activities-container th div, #requirement-container th div {
- background: #6292C5;
+ /*background: #6292C5;*/
}
#sub-activities-container .yui-dt table, #requirement-container .yui-dt table {
- border: 1px solid #98BFE8;
+ /*border: 1px solid #98BFE8;*/
}
#sub-activities-container .yui-dt table {
@@ -2418,9 +2418,11 @@
width: 1000px;
}
-#sub-activities-container th a, #requirement-container th a,
-#sub-activities-container th span, #requirement-container th span {
- color: #F9FCFE;
+#sub-activities-container th a, #sub-activities-container th span,
+#requirement-container th a, #requirement-container th span,
+#allocation-container th a, #allocation-container th span
+{
+ /*color: #F9FCFE;*/
font-weight: bold;
}
Modified: trunk/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-05 07:21:19 UTC (rev 10463)
+++ trunk/logistic/templates/base/requirement/requirement_overview.xsl
2012-11-05 07:46:42 UTC (rev 10464)
@@ -87,7 +87,7 @@
var requestUrl = phpGWLink('index.php', oArgs,
true);
var myColumnDefs = [
- {key:"id", sortable:true},
+ {key:"id", label:'Id', sortable:true},
{key:"fm_bim_item_name", label:'Navn på
ressurs', sortable:true},
{key:"resource_type_descr",
label:'Ressurstype', sortable:true},
{key:"location_code", label:'Lokasjonskode',
sortable:true},
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10464],
Torstein <=