[Fmsystem-commits] [10417]

[Torstein]

Revision: 10417
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10417
Author:   vator
Date:     2012-11-02 07:29:09 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/inc/class.uiproject.inc.php
    trunk/logistic/js/logistic/activity.js
    trunk/logistic/js/logistic/project.js
    trunk/logistic/setup/phpgw_no.lang

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-01 14:49:29 UTC (rev 
10416)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-02 07:29:09 UTC (rev 
10417)
@@ -409,8 +409,9 @@
 
                        $GLOBALS['phpgw']->jqcal->add_listener('start_date');
                        $GLOBALS['phpgw']->jqcal->add_listener('end_date');
-
-                       
self::render_template_xsl(array('activity/add_activity_item'), $data);
+                       
+                       self::add_javascript('logistic', 'logistic', 
'activity.js');
+                       self::render_template_xsl('activity/add_activity_item', 
$data);
                }
                
                public function view()
@@ -574,7 +575,7 @@
                                                ),
                                                array(
                                                        'key' => 'status',
-                                                       'label' => 
lang('Status'),
+                                                       'label' => lang('Status 
requirement'),
                                                        'sortable' => false,
                                                ),
                                                array(

Modified: trunk/logistic/inc/class.uiproject.inc.php
===================================================================
--- trunk/logistic/inc/class.uiproject.inc.php  2012-11-01 14:49:29 UTC (rev 
10416)
+++ trunk/logistic/inc/class.uiproject.inc.php  2012-11-02 07:29:09 UTC (rev 
10417)
@@ -209,15 +209,15 @@
                                        'source' => 
self::link(array('menuaction' => 'logistic.uiproject.index', 'phpgw_return_as' 
=> 'json')),
                                        'field' => array(
                                                array(
-                                                       'key' => 'name',
-                                                       'label' => 
lang('Project name'),
-                                                       'sortable' => true
-                                               ),
-                                               array(
                                                        'key' => 'id',
                                                        'label' => lang('ID'),
                                                        'sortable' => true,
                                                        'formatter' => 
'YAHOO.portico.formatLink'
+                                               ),              
+                                               array(
+                                                       'key' => 'name',
+                                                       'label' => 
lang('Project name'),
+                                                       'sortable' => true
                                                ),
                                                array(
                                                        'key' => 'description',

Modified: trunk/logistic/js/logistic/activity.js
===================================================================
--- trunk/logistic/js/logistic/activity.js      2012-11-01 14:49:29 UTC (rev 
10416)
+++ trunk/logistic/js/logistic/activity.js      2012-11-02 07:29:09 UTC (rev 
10417)
@@ -2,14 +2,43 @@
        $("#select_activity").change(function () {
                 var parent_id = $(this).val();
                 var thisForm = $(this).closest("form");
-                var project_id = 
$(thisForm).find("input[name=project_id]").val();
                 var activity_id = 
$(thisForm).find("input[name=activity_id]").val();
+                var activity_id = 
$(thisForm).find("input[name=activity_id]").val();
                 
                 var oArgs = {menuaction:'logistic.uiactivity.edit'};
                 var baseUrl = phpGWLink('index.php', oArgs, false);
                 var requestUrl = baseUrl + "&parent_id=" + parent_id + 
"&activity_id=" + activity_id;
                         
                 window.location.href = requestUrl;
-  });  
+       });
        
+       $("#activity_details input").focus(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeIn(200);
+       });
+       
+       $("#activity_details textarea").focus(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeIn(200);
+       });
+
+       $("#activity_details select").focus(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeIn(200);
+       });
+       
+       $("#activity_details textarea").focusout(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeOut();
+       });
+       
+       $("#activity_details input").focusout(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeOut();
+       });
+               
+       $("#activity_details select").focusout(function(e){
+               var wrpElem = $(this).parents("dd");
+               $(wrpElem).find(".help_text").fadeOut();
+       });
 });
\ No newline at end of file

Modified: trunk/logistic/js/logistic/project.js
===================================================================
--- trunk/logistic/js/logistic/project.js       2012-11-01 14:49:29 UTC (rev 
10416)
+++ trunk/logistic/js/logistic/project.js       2012-11-02 07:29:09 UTC (rev 
10417)
@@ -29,5 +29,4 @@
                var wrpElem = $(this).parents("dd");
                $(wrpElem).find(".help_text").fadeOut();
        });
-       
 });
\ No newline at end of file

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-01 14:49:29 UTC (rev 10416)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-02 07:29:09 UTC (rev 10417)
@@ -71,4 +71,5 @@
 Num allocated  logistic        no      Antall bestilte
 Status logistic        no      Status
 Requirement allocation logistic        no      Bestilling av ressurser
-Activity details       logistic        no      Detaljer for aktivitet
\ No newline at end of file
+Activity details       logistic        no      Detaljer for aktivitet
+Status requirement     logistic        no      Status behov
\ No newline at end of file