gemstracker-svn

[Gemstracker-svn] SF.net SVN: gemstracker:[431] branches/1.5.x

[<gem...@li...>]

Revision: 431
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=431&view=rev
Author:   michieltcs
Date:     2012-01-30 13:36:35 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Merge r351 from branch 1.5.0-pulse

Revision Links:
--------------
    http://gemstracker.svn.sourceforge.net/gemstracker/?rev=351&view=rev

Modified Paths:
--------------
    branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php

Property Changed:
----------------
    branches/1.5.x/


Property changes on: branches/1.5.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-342,344,346
/tags/1.5.0beta1:305
   + /branches/1.5.0-pulse:306-430
/tags/1.5.0beta1:305

Modified: branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php
===================================================================
--- branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php	2012-01-30 10:04:25 UTC (rev 430)
+++ branches/1.5.x/library/classes/Gems/User/OldStaffUserDefinition.php	2012-01-30 13:36:35 UTC (rev 431)
@@ -111,6 +111,7 @@
                 $this->db->update('gems__staff', $values, $this->db->quoteInto('gsf_id_user = ?', $staff_id));
 
             } catch (Zend_Db_Exception $e) {
+                GemsEscort::getInstance()->logger->log($e->getMessage(), Zend_Log::ERR);
                 // Fall through as this does not work if the database upgrade did not run
                 // MUtil_Echo::r($e);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[469] branches/1.5.x

[<gem...@li...>]

Revision: 469
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=469&view=rev
Author:   michieltcs
Date:     2012-02-13 15:44:10 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Merge r467 from 1.5.0-pulse

Revision Links:
--------------
    http://gemstracker.svn.sourceforge.net/gemstracker/?rev=467&view=rev

Modified Paths:
--------------
    branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php

Property Changed:
----------------
    branches/1.5.x/
    branches/1.5.x/library/
    branches/1.5.x/new_project/htdocs/gems/


Property changes on: branches/1.5.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse:306-430
/tags/1.5.0beta1:305
   + /branches/1.5.0-pulse:306-430,467
/tags/1.5.0beta1:305


Property changes on: branches/1.5.x/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-344,346
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
   + /branches/1.5.0-pulse/library:306-344,346,467
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305

Modified: branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php
===================================================================
--- branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php	2012-02-13 15:02:18 UTC (rev 468)
+++ branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php	2012-02-13 15:44:10 UTC (rev 469)
@@ -54,7 +54,7 @@
      */
     protected $escort;
 
-    protected $messages;
+    protected $messages = array();
 
     protected $model;
 


Property changes on: branches/1.5.x/new_project/htdocs/gems
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/new_project/htdocs/gems:306-430
/tags/1.5.0beta1/new_project/htdocs/gems:305
/trunk/new_project/htdocs/gems:461
   + /branches/1.5.0-pulse/new_project/htdocs/gems:306-430,467
/tags/1.5.0beta1/new_project/htdocs/gems:305
/trunk/new_project/htdocs/gems:461

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gemstracker-svn] SF.net SVN: gemstracker:[471] branches/1.5.x

[<gem...@li...>]

Revision: 471
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=471&view=rev
Author:   mennodekker
Date:     2012-02-14 10:34:21 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
minor display fixes and added login to project.ini

Modified Paths:
--------------
    branches/1.5.x/library/classes/Gems/Default/RespondentAction.php
    branches/1.5.x/new_project/application/configs/project.ini
    branches/1.5.x/new_project/htdocs/gems/css/gems-new.css

Modified: branches/1.5.x/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- branches/1.5.x/library/classes/Gems/Default/RespondentAction.php	2012-02-14 10:20:56 UTC (rev 470)
+++ branches/1.5.x/library/classes/Gems/Default/RespondentAction.php	2012-02-14 10:34:21 UTC (rev 471)
@@ -148,7 +148,7 @@
         $bridge->addDate(    'grs_birthday',       'jQueryParams', array('defaultDate' => '-30y', 'maxDate' => 0, 'yearRange' => ($year - 130) . ':' . $year))
             ->addValidator(new MUtil_Validate_Date_DateBefore());
 
-        $bridge->addSelect(  'gr2o_id_physician');
+        //$bridge->addSelect(  'gr2o_id_physician');
         $bridge->addText(    'gr2o_treatment',     'size', 30, 'description', $this->_('DBC\'s, etc...'));
         $bridge->addTextarea('gr2o_comments',      'rows', 4, 'cols', 60);
 
@@ -404,4 +404,4 @@
         $params['respondentData'] = $data;
         $this->addSnippets($this->showSnippets, $params);
     }
-}
\ No newline at end of file
+}

Modified: branches/1.5.x/new_project/application/configs/project.ini
===================================================================
--- branches/1.5.x/new_project/application/configs/project.ini	2012-02-14 10:20:56 UTC (rev 470)
+++ branches/1.5.x/new_project/application/configs/project.ini	2012-02-14 10:34:21 UTC (rev 471)
@@ -171,6 +171,7 @@
 
 layoutPrepare.title                 = 1
 layoutPrepare.projectName           = header
+layoutPrepare.login                 = header_bar
 layoutPrepare.contact               = header_bar
 layoutPrepare.localeSet             = header_bar
 layoutPrepare.organizationSwitcher  = header_bar
@@ -185,6 +186,7 @@
 layoutPrepare.dojo                  = 0
 layoutPrepare.jQuery                = 1
 
+layoutPrepare.login.class         = rightFloat
 layoutPrepareArgs.contact.class   = rightFloat
 layoutPrepareArgs.time.class      = rightFloat
 layoutPrepareArgs.user.class      = rightFloat

Modified: branches/1.5.x/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- branches/1.5.x/new_project/htdocs/gems/css/gems-new.css	2012-02-14 10:20:56 UTC (rev 470)
+++ branches/1.5.x/new_project/htdocs/gems/css/gems-new.css	2012-02-14 10:34:21 UTC (rev 471)
@@ -224,6 +224,11 @@
     width: 100%;
 }
 
+#login .logout {
+    margin-left: 1em;
+    margin-right: .5em;
+}
+
 img {
     border: 0 solid transparent;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.