Menu
▾
▴
gemstracker-svn — Receive updates on svn commits
You can subscribe to this list here.
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
(70) |
Nov
(164) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2012 |
Jan
(52) |
Feb
(77) |
Mar
(70) |
Apr
(58) |
May
(81) |
Jun
(74) |
Jul
(87) |
Aug
(30) |
Sep
(45) |
Oct
(37) |
Nov
(51) |
Dec
(31) |
| 2013 |
Jan
(47) |
Feb
(29) |
Mar
(40) |
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gem...@li...> - 2011-09-21 07:06:04
|
Revision: 55
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=55&view=rev
Author: mennodekker
Date: 2011-09-21 07:05:58 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Renaming tblSpecial to tableSpecial in the new css too
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 17:20:46 UTC (rev 54)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-21 07:05:58 UTC (rev 55)
@@ -147,7 +147,7 @@
border: 1px solid;
}
-.tblSpecial,
+.tableSpecial,
.zend_echo,
.errors,
.ui-tabs-nav-item.taberror span {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 17:20:52
|
Revision: 54
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=54&view=rev
Author: matijsdejong
Date: 2011-09-20 17:20:46 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- documentation changes only
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
trunk/library/classes/Gems/Default/TokenPlanAction.php
trunk/library/controllers/MailLogController.php
trunk/library/controllers/OverviewPlanController.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-09-20 16:00:47 UTC (rev 53)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-09-20 17:20:46 UTC (rev 54)
@@ -181,7 +181,7 @@
*
* @param MUtil_Model_TableBridge $bridge
* @param MUtil_Model_ModelAbstract $model
- * @rturn void
+ * @return void
*/
protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
{
Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php 2011-09-20 16:00:47 UTC (rev 53)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php 2011-09-20 17:20:46 UTC (rev 54)
@@ -75,7 +75,7 @@
$bridge->addSortable('gto_valid_from');
$bridge->addSortable('gto_valid_until');
- $bridge->addMultiSort('gr2o_patient_nr', $HTML->raw(', '), 'respondent_name');
+ $bridge->addMultiSort('gr2o_patient_nr', $HTML->raw('; '), 'respondent_name');
$bridge->addMultiSort('ggp_name', array($this->getActionLinks($bridge)));
$bridge->tr();
@@ -83,7 +83,7 @@
$bridge->addSortable('gto_completion_time');
if ($this->escort instanceof Gems_Project_Tracks_SingleTrackInterface) {
- $bridge->addMultiSort('calc_round_description', $HTML->raw(', '), 'gsu_survey_name');
+ $bridge->addMultiSort('calc_round_description', $HTML->raw('; '), 'gsu_survey_name');
} else {
$model->set('calc_track_info', 'tableDisplay', 'smallData');
$model->set('calc_round_description', 'tableDisplay', 'smallData');
Modified: trunk/library/controllers/MailLogController.php
===================================================================
--- trunk/library/controllers/MailLogController.php 2011-09-20 16:00:47 UTC (rev 53)
+++ trunk/library/controllers/MailLogController.php 2011-09-20 17:20:46 UTC (rev 54)
@@ -36,7 +36,7 @@
/**
*
- * @package Gems
+ * @package Gems
* @subpackage Default
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
Modified: trunk/library/controllers/OverviewPlanController.php
===================================================================
--- trunk/library/controllers/OverviewPlanController.php 2011-09-20 16:00:47 UTC (rev 53)
+++ trunk/library/controllers/OverviewPlanController.php 2011-09-20 17:20:46 UTC (rev 54)
@@ -1,10 +1,9 @@
<?php
-
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -15,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -26,8 +25,24 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package Gems
+ * @subpackage Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
+/**
+ *
+ * @package Gems
+ * @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.1
+ */
class OverviewPlanController extends Gems_Default_OverviewPlanAction
{
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 16:00:53
|
Revision: 53
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=53&view=rev
Author: matijsdejong
Date: 2011-09-20 16:00:47 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- did not find a jQuery class so renamed tblSpecial to tableSpecial
- fixed documentation tags
Modified Paths:
--------------
trunk/library/classes/MUtil/Html/HtmlElement.php
trunk/library/classes/MUtil/Html/TableElement.php
Modified: trunk/library/classes/MUtil/Html/HtmlElement.php
===================================================================
--- trunk/library/classes/MUtil/Html/HtmlElement.php 2011-09-20 16:00:17 UTC (rev 52)
+++ trunk/library/classes/MUtil/Html/HtmlElement.php 2011-09-20 16:00:47 UTC (rev 53)
@@ -1,37 +1,39 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.1
- * @package MUtil
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
@@ -206,6 +208,7 @@
* @subpackage Html
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
+ * @since Class available since version 1.0
*/
class MUtil_Html_HtmlElement extends Zend_View_Helper_HtmlElement
implements MUtil_Html_ElementInterface, MUtil_Lazy_Procrastinator
@@ -281,7 +284,7 @@
*/
protected $_content = array();
-
+
/**
* @var boolean|string When true, no content is used, when a string content is added to an attribute with that name.
*/
@@ -316,19 +319,19 @@
*/
protected $_lastChild;
-
+
/**
* Cache for Lazy object version of this element.
- *
+ *
* @var MUtil_Lazy_ObjectWrap
*/
protected $_lazy;
-
+
/**
* The content to display when there is no other data to display when rendering.
- *
- * The reason for there being nothing to display can be that the $_repeater contains
+ *
+ * The reason for there being nothing to display can be that the $_repeater contains
* no data. But another reason might be that there is simply nothing to display e.g.
* because of conditional statements.
* <code>
@@ -341,21 +344,21 @@
* }
* $div->setOnEmpty(MUtil_Html::create()->p('We do not yet have a description for this item.'));
* </code>
- *
+ *
* When asking for the content an empty MUtil_Html_Sequence is returned, so the last line can
* be simplified to:
* <code>
* $div->getOnEmpty()->p('We do not yet have a description for this item.');
* </code>
- *
+ *
* @see $_repeater;
* @see setOnEmpty()
- *
+ *
* @var mixed Content to display when the $_repeater contains no data.
*/
protected $_onEmptyContent;
-
+
/**
* Usually no text is appended before an element, but for certain elements we choose
* to add a "\n" newline character instead, to keep the output readable in source
@@ -365,7 +368,7 @@
*/
protected $_prependString = '';
-
+
/**
* The traditional method of outputting repeated data is added the items to the output
* element in a loop. E.g.:
@@ -375,19 +378,19 @@
* $ul->li($row['title'], array('class' => $row['class']));
* }
* </code>
- *
+ *
* The MUtil Html sub package allows an alternate method of specifying this, eliminating
* the loop:
* <code>
* $ul = new MUtil_Html_ListElement('ul');
* $ul->setRepeater($data);
- *
+ *
* $rep = $ul->getRepeater();
* $ul->li($rep->title, array('class' => $rep['class']));
* </code>
* Both the property and the array notation can be used to access data in the repeater,
* but the propery version is preferred.
- *
+ *
* By default only the contents of the element is repeated, not the tags themselves.
* Setting _repeatTags to true will repeat the whole element including the tags. This
* example repeats the 'li' items including their tags instead of the contents of the
@@ -398,7 +401,7 @@
* $ul->li($rep->title, array('class' => $rep->class, 'repeater' => $repeater, 'repeatTags' => true));
* </code>
* As long as the 'ul' element contains only a single 'li' the resulting output is the same.
- *
+ *
* If there is no data in the input, e.g. when $data is an empty array, the tradition loop requires
* an extra if:
* <code>
@@ -421,7 +424,7 @@
* $ul->renderWithoutContent = false;
* $ul->li($rep->title, array('class' => $rep->class));
* </code>
- *
+ *
* When outputting an alternative value when the array is empty like this:
* <code>
* $ul = new MUtil_Html_ListElement('ul');
@@ -441,13 +444,13 @@
* $ul->setOnEmpty('No data');
* $ul->li($rep->title, array('class' => $rep->class));
* </code>
- * The ListElement will autmatically put the 'No data' text in its own 'li'
+ * The ListElement will autmatically put the 'No data' text in its own 'li'
* element. Use getOnEmpty() to change it:
* <code>
* $ul->getOnEmpty()->class = 'disabled';
* </code>
- *
- *
+ *
+ *
* @see $_onEmptyContent
* @see $_repeatTags
* @see $renderWithoutContent
@@ -455,24 +458,24 @@
* @see setRepeater()
* @see setRepeatTags()
* @see MUtil_Lazy_RepeatableInterface
- *
+ *
* @var MUtil_Lazy_RepeatableInterface
*/
protected $_repeater;
-
-
+
+
/**
- * When repeatTags is false (the default) only the content is repeated but
+ * When repeatTags is false (the default) only the content is repeated but
* not the element tags. When repeatTags is true the both the tags and the
* content are repeated.
- *
+ *
* @see $_repeater
- *
+ *
* @var boolean The repeatTags switch, default false.
*/
protected $_repeatTags = false;
-
+
protected $_specialTypes;
private $_specialTypesDefault = array(
@@ -495,7 +498,7 @@
* dd, dl, dt, label, li, ol, table, tbody, tfoot, thead and ul
*
* @see $_repeater
- *
+ *
* @var boolean The element is rendered even without content when true.
*/
public $renderWithoutContent = true;
@@ -515,17 +518,17 @@
/**
* Adds an HtmlElement to this element
- *
+ *
* @see MUtil_Html_Creator
- *
+ *
* @param string $name Function name becomes tagname (unless specified otherwise in MUtil_Html_Creator)
- * @param array $arguments The content and attributes values
+ * @param array $arguments The content and attributes values
* @return MUtil_Html_HtmlElement With '$name' tagName
*/
public function __call($name, array $arguments)
{
$elem = MUtil_Html::createArray($name, $arguments);
-
+
$this[] = $elem;
return $elem;
@@ -746,7 +749,7 @@
if ($attrib instanceof MUtil_Lazy_LazyInterface) {
$attrib = new MUtil_Html_ArrayAttribute($name, $attrib);
-
+
} elseif ($attrib && ($value instanceof MUtil_Lazy_LazyInterface)) {
if (! $attrib instanceof MUtil_Html_AttributeInterface) {
$attrib = new MUtil_Html_ArrayAttribute($name, $attrib);
@@ -847,17 +850,17 @@
}
/**
- * When repeatTags is false (the default) only the content is repeated but
+ * When repeatTags is false (the default) only the content is repeated but
* not the element tags. When repeatTags is true the both the tags and the
* content are repeated.
- *
+ *
* @return boolean The repeatTags switch.
*/
public function getRepeatTags()
{
return $this->_repeatTags;
}
-
+
public function getTagName()
{
return $this->tagName;
@@ -890,15 +893,15 @@
}
return;
}
-
+
$value = $this->_createDefaultTag($value, $offset);
}
-
+
// Set as last child when this is a new item only.
if (! isset($offset, $this->_content[$offset])) {
$this->_lastChild = $value;
}
-
+
if (null === $offset) {
$this->_content[] = $value;
} else {
@@ -915,7 +918,7 @@
/**
* Renders the element into a html string
- *
+ *
* The $view is used to correctly encode and escape the output
*
* @param Zend_View_Abstract $view
@@ -925,17 +928,17 @@
{
$this->setView($view);
- if ($this->_repeater &&
- $this->_repeatTags &&
+ if ($this->_repeater &&
+ $this->_repeatTags &&
$this->_repeater->__start()) {
-
+
$html = null;
while ($this->_repeater->__next()) {
$html .= $this->renderElement($view);
}
return $html;
-
+
} else {
return $this->renderElement($view);
}
@@ -943,7 +946,7 @@
/**
* Function to allow overloading of content rendering only
- *
+ *
* The $view is used to correctly encode and escape the output
*
* @param Zend_View_Abstract $view
@@ -976,9 +979,9 @@
/**
* Function to allow overloading of tag rendering only
- *
+ *
* Renders the element tag with it's content into a html string
- *
+ *
* The $view is used to correctly encode and escape the output
*
* @param Zend_View_Abstract $view
@@ -1014,7 +1017,7 @@
/**
* Set this elements attribute value
- *
+ *
* @param string $name
* @param mixed $value
* @return MUtil_Html_HtmlElement (continuation pattern)
@@ -1030,8 +1033,8 @@
* the tagname of the element that is created to contain the content.
*
* @see $_defaultChildTag
- *
- * @param string $tag Tagname
+ *
+ * @param string $tag Tagname
* @return MUtil_Html_HtmlElement (continuation pattern)
*/
public function setDefaultChildTag($tag)
@@ -1042,8 +1045,8 @@
/**
* Set the content displayed by the item when it is empty during rendering.
- *
- * The reason for there being nothing to display can be that the $_repeater contains
+ *
+ * The reason for there being nothing to display can be that the $_repeater contains
* no data. But another reason might be that there is simply nothing to display e.g.
* because of conditional statements.
* <code>
@@ -1056,16 +1059,16 @@
* }
* $div->setOnEmpty(MUtil_Html::create()->p('We do not yet have a description for this item.'));
* </code>
- *
+ *
* Some subclasses require their content to be a HtmlElement of a certain type. If the content
* is not of that type, then it is automatically put in an element with $_defaultChildTag as
* $tagName.
- *
+ *
* @see $_defaultChildTag
* @see $_onEmptyContent;
* @see $_repeater;
* @see getOnEmpty()
- *
+ *
* @param mixed $content Content that can be rendered.
* @return MUtil_Html_HtmlElement (continuation pattern)
*/
@@ -1080,12 +1083,12 @@
}
/**
- * Repeat the element when rendering.
- *
- * When repeatTags is false (the default) only the content is repeated but
+ * Repeat the element when rendering.
+ *
+ * When repeatTags is false (the default) only the content is repeated but
* not the element tags. When repeatTags is true the both the tags and the
* content are repeated.
- *
+ *
* @param mixed $repeater MUtil_Lazy_RepeatableInterface or something that can be made into one.
* @param mixed $onEmptyContent Optional. When not null the content to display when the repeater does not result in data is set.
* @param boolean $repeatTags Optional when not null the repeatTags switch is set.
@@ -1102,19 +1105,19 @@
if (null !== $onEmptyContent) {
$this->setOnEmpty($onEmptyContent);
}
-
+
if (null !== $repeatTags) {
$this->setRepeatTags($repeatTags);
}
return $this;
}
-
+
/**
- * When repeatTags is false (the default) only the content is repeated but
+ * When repeatTags is false (the default) only the content is repeated but
* not the element tags. When repeatTags is true the both the tags and the
* content are repeated.
- *
+ *
* @param boolean $repeatTags Set the repeatTags switch.
* @return MUtil_Html_HtmlElement (continuation pattern)
*/
Modified: trunk/library/classes/MUtil/Html/TableElement.php
===================================================================
--- trunk/library/classes/MUtil/Html/TableElement.php 2011-09-20 16:00:17 UTC (rev 52)
+++ trunk/library/classes/MUtil/Html/TableElement.php 2011-09-20 16:00:47 UTC (rev 53)
@@ -26,22 +26,24 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * @author Matijs de Jong
- * @since 1.0
- * @version 1.4
- * @package MUtil
+ *
+ *
+ * @package MUtil
* @subpackage Html
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
*/
/**
* TableElement is an extension of HtmlElement that add's a lot of table specific extra functionality
*
- * @author Matijs de Jong
- * @package MUtil
+ * @package MUtil
* @subpackage Html
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.0
*/
class MUtil_Html_TableElement extends MUtil_Html_HtmlElement implements MUtil_Html_ColumnInterface, MUtil_Html_FormLayout
{
@@ -86,7 +88,7 @@
/**
* Constant for start of display of any special type of value in static createX and renderX functions
*/
- const RENDER_OPEN = '<span class="tblSpecial">';
+ const RENDER_OPEN = '<span class="tableSpecial">';
/**
* All new content is added to the last (tbody) element.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 16:00:27
|
Revision: 52
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=52&view=rev
Author: matijsdejong
Date: 2011-09-20 16:00:17 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- did not find a jQuery class so renamed tblSpecial to tableSpecial
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems.css
Modified: trunk/new_project/htdocs/gems/css/gems.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems.css 2011-09-20 15:42:08 UTC (rev 51)
+++ trunk/new_project/htdocs/gems/css/gems.css 2011-09-20 16:00:17 UTC (rev 52)
@@ -90,7 +90,7 @@
}
/* #FFFF00 */
-.tblSpecial,
+.tableSpecial,
.errors,
.ui-tabs-nav-item.taberror span {
color: #DD0000;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 15:42:19
|
Revision: 51
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=51&view=rev
Author: matijsdejong
Date: 2011-09-20 15:42:08 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- put the log into respondent_communications table name
- added template save to OneMailForm.php
- made temporary old style controller for mail log
Modified Paths:
--------------
trunk/library/classes/Gems/Default/MailLogAction.php
trunk/library/classes/Gems/Default/RespondentAction.php
trunk/library/classes/Gems/Email/OneMailForm.php
trunk/library/classes/Gems/Email/TemplateMailer.php
trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php
trunk/library/configs/db/patches.sql
trunk/library/controllers/MailLogController.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Added Paths:
-----------
trunk/library/classes/Gems/Default/MailLogActionOldStyle.php
trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql
trunk/library/configs/db/tables/gems__mail_jobs.300.sql
Removed Paths:
-------------
trunk/library/configs/db/tables/gems__respondent_communications.60.sql
Modified: trunk/library/classes/Gems/Default/MailLogAction.php
===================================================================
--- trunk/library/classes/Gems/Default/MailLogAction.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Default/MailLogAction.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -62,16 +62,44 @@
*/
public function createModel($detailed, $action)
{
- $model = new MUtil_Model_TableModel('gems__respondent_communications');
+ $model = new Gems_Model_JoinModel('maillog', 'gems__log_respondent_communications');
- // $model->set('grco_id_to', 'label', $this->_(''));
- // $model->set('grco_id_by', 'label', $this->_(''));
- $model->set('grco_address', 'label', $this->_('To'));
- $model->set('grco_sender', 'label', $this->_('From'));
- $model->set('grco_topic', 'label', $this->_('Subject'));
- $model->set('grco_created', 'label', $this->_('Date sent'));
- // $model->set('', 'label', $this->_(''));
+ $model->addLeftTable('gems__respondents', array('grco_id_to' => 'grs_id_user'));
+ $model->addLeftTable('gems__staff', array('grco_id_by' => 'gsf_id_user'));
+ $model->addLeftTable('gems__mail_templates', array('grco_id_message' => 'gmt_id_message'));
+ $model->addColumn(
+ "TRIM(CONCAT(COALESCE(CONCAT(grs_last_name, ', '), '-, '), COALESCE(CONCAT(grs_first_name, ' '), ''), COALESCE(grs_surname_prefix, '')))",
+ 'respondent_name');
+ $model->addColumn(
+ "CASE WHEN gems__staff.gsf_id_user IS NULL
+ THEN '-'
+ ELSE
+ CONCAT(
+ COALESCE(gems__staff.gsf_last_name, ''),
+ ', ',
+ COALESCE(gems__staff.gsf_first_name, ''),
+ COALESCE(CONCAT(' ', gems__staff.gsf_surname_prefix), '')
+ )
+ END",
+ 'assigned_by');
+
+ $model->resetOrder();
+
+ $model->set('grco_created', 'label', $this->_('Date sent'));
+ $model->set('respondent_name', 'label', $this->_('Receiver'));
+ $model->set('grco_address', 'label', $this->_('To address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('assigned_by', 'label', $this->_('Sender'));
+ $model->set('grco_sender', 'label', $this->_('From address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('grco_id_token', 'label', $this->_('Token'));
+ $model->set('grco_topic', 'label', $this->_('Subject'));
+
+ if ($detailed) {
+ $model->set('gmt_subject', 'label', $this->_('Template'));
+ } else {
+ $model->set('grco_created', 'formatFunction', $this->util->getTranslated()->formatDate);
+ }
+
return $model;
}
Added: trunk/library/classes/Gems/Default/MailLogActionOldStyle.php
===================================================================
--- trunk/library/classes/Gems/Default/MailLogActionOldStyle.php (rev 0)
+++ trunk/library/classes/Gems/Default/MailLogActionOldStyle.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Short description of file
+ *
+ * @package Gems
+ * @subpackage Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 203 2011-07-07 12:51:32Z matijs $
+ */
+
+/**
+ * Temprary class until Gems_Controller_ModelSnippetActionAbstract works
+ *
+ * @package Gems
+ * @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4.2
+ */
+class Gems_Default_MailLogActionOldStyle extends Gems_Controller_BrowseEditAction
+{
+ public $sortKey = array('grco_created' => SORT_DESC);
+
+ /**
+ * Adds columns from the model to the bridge that creates the browse table.
+ *
+ * Adds a button column to the model, if such a button exists in the model.
+ *
+ * @param MUtil_Model_TableBridge $bridge
+ * @param MUtil_Model_ModelAbstract $model
+ * @rturn void
+ */
+ protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
+ {
+ if ($menuItem = $this->findAllowedMenuItem('show')) {
+ $bridge->addItemLink($menuItem->toActionLinkLower($this->getRequest(), $bridge));
+ }
+
+ // Newline placeholder
+ $br = MUtil_Html::create('br');
+
+ $bridge->addMultiSort('grco_created', $br, 'respondent_name', $br, 'grco_address');
+ $bridge->addMultiSort('grco_id_token', $br, 'assigned_by', $br, 'grco_sender');
+ $bridge->addMultiSort('grco_topic');
+ }
+
+ /**
+ * Creates a model for getModel(). Called only for each new $action.
+ *
+ * The parameters allow you to easily adapt the model to the current action. The $detailed
+ * parameter was added, because the most common use of action is a split between detailed
+ * and summarized actions.
+ *
+ * @param boolean $detailed True when the current action is not in $summarizedActions.
+ * @param string $action The current action.
+ * @return MUtil_Model_ModelAbstract
+ */
+ public function createModel($detailed, $action)
+ {
+ $model = new Gems_Model_JoinModel('maillog', 'gems__log_respondent_communications');
+
+ $model->addLeftTable('gems__respondents', array('grco_id_to' => 'grs_id_user'));
+ $model->addLeftTable('gems__staff', array('grco_id_by' => 'gsf_id_user'));
+ $model->addLeftTable('gems__mail_templates', array('grco_id_message' => 'gmt_id_message'));
+
+ $model->addColumn(
+ "TRIM(CONCAT(COALESCE(CONCAT(grs_last_name, ', '), '-, '), COALESCE(CONCAT(grs_first_name, ' '), ''), COALESCE(grs_surname_prefix, '')))",
+ 'respondent_name');
+ $model->addColumn(
+ "CASE WHEN gems__staff.gsf_id_user IS NULL
+ THEN '-'
+ ELSE
+ CONCAT(
+ COALESCE(gems__staff.gsf_last_name, ''),
+ ', ',
+ COALESCE(gems__staff.gsf_first_name, ''),
+ COALESCE(CONCAT(' ', gems__staff.gsf_surname_prefix), '')
+ )
+ END",
+ 'assigned_by');
+
+ $model->resetOrder();
+
+ $model->set('grco_created', 'label', $this->_('Date sent'));
+ $model->set('respondent_name', 'label', $this->_('Receiver'));
+ $model->set('grco_address', 'label', $this->_('To address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('assigned_by', 'label', $this->_('Sender'));
+ $model->set('grco_sender', 'label', $this->_('From address'), 'itemDisplay', 'MUtil_Html_AElement::ifmail');
+ $model->set('grco_id_token', 'label', $this->_('Token'));
+ $model->set('grco_topic', 'label', $this->_('Subject'));
+
+ if ($detailed) {
+ $model->set('gmt_subject', 'label', $this->_('Template'));
+ } else {
+ $model->set('grco_created', 'formatFunction', $this->util->getTranslated()->formatDate);
+ }
+
+ return $model;
+ }
+
+ /**
+ * Helper function to allow generalized statements about the items in the model.
+ *
+ * @param int $count
+ * @return $string
+ */
+ public function getTopic($count = 1)
+ {
+ return $this->plural('Activity Log', 'Activity Logs', $count);
+ }
+
+
+ /**
+ * Helper function to allow generalized treatment of the header.
+ *
+ * return $string
+ */
+ public function getTopicTitle()
+ {
+ return $this->_('Mail Activity Log');
+ }
+}
Modified: trunk/library/classes/Gems/Default/RespondentAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RespondentAction.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Default/RespondentAction.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -59,6 +59,15 @@
public $useTabbedForms = true;
+ /**
+ * Adds columns from the model to the bridge that creates the browse table.
+ *
+ * Adds a button column to the model, if such a button exists in the model.
+ *
+ * @param MUtil_Model_TableBridge $bridge
+ * @param MUtil_Model_ModelAbstract $model
+ * @rturn void
+ */
protected function addBrowseTableColumns(MUtil_Model_TableBridge $bridge, MUtil_Model_ModelAbstract $model)
{
$model->setIfExists('gr2o_opened', 'tableDisplay', 'small');
Modified: trunk/library/classes/Gems/Email/OneMailForm.php
===================================================================
--- trunk/library/classes/Gems/Email/OneMailForm.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Email/OneMailForm.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -134,6 +134,7 @@
$this->mailer->setSubject($this->getValue('gmt_subject'));
$this->mailer->setBody($this->getValue('gmt_body'));
+ $this->mailer->setTemplateId($this->getValue('select_subject'));
if ($message = $this->mailer->processMail($tokenData)) {
$this->addMessage($this->escort->_('Mail failed to send.'));
Modified: trunk/library/classes/Gems/Email/TemplateMailer.php
===================================================================
--- trunk/library/classes/Gems/Email/TemplateMailer.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Email/TemplateMailer.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -481,7 +481,7 @@
$cdata['grco_id_by'] = $uid;
$cdata['grco_organization'] = $tokenData['gor_id_organization'];
$cdata['grco_id_token'] = $tokenData['gto_id_token'];
-
+
$cdata['grco_method'] = 'email';
$cdata['grco_topic'] = substr($this->_mailSubject, 0, 120);
$cdata['grco_address'] = substr($to, 0, 120);
@@ -494,7 +494,7 @@
$cdata['grco_created'] = $this->_changeDate;
$cdata['grco_created_by'] = $uid;
- $db->insert('gems__respondent_communications', $cdata);
+ $db->insert('gems__log_respondent_communications', $cdata);
}
}
}
Modified: trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/classes/Gems/Tracker/Model/StandardTokenModel.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -206,7 +206,7 @@
// Token items
$this->set('gto_id_token', 'label', $this->translate->_('Token'));
$this->set('gto_round_description', 'label', $this->translate->_('Round'));
- $this->set('gto_valid_from', 'label', $this->translate->_('Measure(d) on'), 'formatFunction', $translated->formatDateNever, 'tdClass', 'date');
+ $this->set('gto_valid_from', 'label', $this->translate->_('Measure(d) on'), 'formatFunction', $translated->formatDateNever, 'tdClass', 'date');
$this->set('gto_valid_until', 'label', $this->translate->_('Valid until'), 'formatFunction', $translated->formatDateForever, 'tdClass', 'date');
$this->set('gto_mail_sent_date', 'label', $this->translate->_('Last contact'), 'formatFunction', $translated->formatDateNever, 'tdClass', 'date');
$this->set('gto_completion_time', 'label', $this->translate->_('Completed'), 'formatFunction', $translated->formatDateNa, 'tdClass', 'date');
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/configs/db/patches.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -190,6 +190,9 @@
-- PATCH: Organization codes
ALTER TABLE `gems__organizations` ADD gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' AFTER gor_name;
--- PATCH: Extra log
-ALTER TABLE gems__respondent_communications ADD grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null AFTER grco_address;
-ALTER TABLE gems__respondent_communications ADD grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message) AFTER grco_comments;
+-- PATCH: Extra mail logging
+RENAME TABLE gems__respondent_communications TO gems__log_respondent_communications;
+
+ALTER TABLE gems__log_respondent_communications ADD grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null AFTER grco_address;
+ALTER TABLE gems__log_respondent_communications ADD grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message) AFTER grco_comments;
+
Copied: trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql (from rev 46, trunk/library/configs/db/tables/gems__respondent_communications.60.sql)
===================================================================
--- trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql (rev 0)
+++ trunk/library/configs/db/tables/gems__log_respondent_communications.500.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -0,0 +1,29 @@
+
+CREATE TABLE if not exists gems__log_respondent_communications (
+ grco_id_action bigint unsigned not null auto_increment,
+
+ grco_id_to bigint unsigned not null references gems__respondents (grs_id_user),
+ grco_id_by bigint unsigned null default 0 references gems__staff (gsf_id_user),
+ grco_organization bigint unsigned not null references gems__organizations (gor_id_organization),
+
+ grco_id_token varchar(9) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null references gems__tokens (gto_id_token),
+
+ grco_method varchar(12) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+ grco_topic varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+ grco_address varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+ grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+ grco_comments varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+
+ grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message),
+
+ grco_changed timestamp not null default current_timestamp,
+ grco_changed_by bigint unsigned not null,
+ grco_created timestamp not null,
+ grco_created_by bigint unsigned not null,
+
+ PRIMARY KEY (grco_id_action)
+ )
+ ENGINE=InnoDB
+ auto_increment = 200000
+ CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
+
Copied: trunk/library/configs/db/tables/gems__mail_jobs.300.sql (from rev 39, trunk/library/configs/db/tables/gems__mail_templates.200.sql)
===================================================================
--- trunk/library/configs/db/tables/gems__mail_jobs.300.sql (rev 0)
+++ trunk/library/configs/db/tables/gems__mail_jobs.300.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -0,0 +1,36 @@
+
+CREATE TABLE if not exists gems__mail_jobs (
+ gmj_id_message bigint unsigned not null auto_increment,
+
+ gmj_id_organization bigint unsigned not null
+ references gems__organizations (gor_id_organization),
+ gmj_id_message bigint unsigned not null
+ references gems__mail_templates (gmt_id_message),
+
+ gmj_id_user_as bigint unsigned not null
+ references gems__staff (gsf_id_user),
+
+ -- O Use organization from address
+ -- S Use site from address
+ -- U Use gmj_id_user_as from address
+ gmj_from_method varchar(1) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+
+ -- M => multiple per respondent, one for each token
+ -- O => One per respondent, mark all tokens as send
+ -- U / A? => Send only one token, do not mark
+ gmj_process_method varchar(1) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+
+ -- N => notmailed
+ -- R => reminder
+ gmj_filter_mode varchar(1) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+
+ gmj_changed timestamp not null default current_timestamp on update current_timestamp,
+ gmj_changed_by bigint unsigned not null,
+ gmj_created timestamp not null default '0000-00-00 00:00:00',
+ gmj_created_by bigint unsigned not null,
+
+ PRIMARY KEY (gmj_id_message)
+ )
+ ENGINE=InnoDB
+ AUTO_INCREMENT = 800
+ CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
Deleted: trunk/library/configs/db/tables/gems__respondent_communications.60.sql
===================================================================
--- trunk/library/configs/db/tables/gems__respondent_communications.60.sql 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/configs/db/tables/gems__respondent_communications.60.sql 2011-09-20 15:42:08 UTC (rev 51)
@@ -1,29 +0,0 @@
-
-CREATE TABLE if not exists gems__respondent_communications (
- grco_id_action bigint unsigned not null auto_increment,
-
- grco_id_to bigint unsigned not null references gems__respondents (grs_id_user),
- grco_id_by bigint unsigned null default 0 references gems_staff (gsf_id_user),
- grco_organization bigint unsigned not null references gems__organizations (gor_id_organization),
-
- grco_id_token varchar(9) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null references gems__tokens (gto_id_token),
-
- grco_method varchar(12) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
- grco_topic varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
- grco_address varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
- grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
- grco_comments varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
-
- grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message),
-
- grco_changed timestamp not null default current_timestamp,
- grco_changed_by bigint unsigned not null,
- grco_created timestamp not null,
- grco_created_by bigint unsigned not null,
-
- PRIMARY KEY (grco_id_action)
- )
- ENGINE=InnoDB
- auto_increment = 200000
- CHARACTER SET 'utf8' COLLATE 'utf8_general_ci';
-
Modified: trunk/library/controllers/MailLogController.php
===================================================================
--- trunk/library/controllers/MailLogController.php 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/controllers/MailLogController.php 2011-09-20 15:42:08 UTC (rev 51)
@@ -42,6 +42,6 @@
* @license New BSD License
* @since Class available since version 1.4.2
*/
-class MailLogController extends Gems_Default_MailLogAction
+class MailLogController extends Gems_Default_MailLogActionOldStyle
{
}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/languages/default-en.po 2011-09-20 15:42:08 UTC (rev 51)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Pulse EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-19 18:18+0100\n"
+"POT-Creation-Date: 2011-09-20 17:39+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -1069,7 +1069,6 @@
msgstr "Username"
#: classes/Gems/Default/IndexAction.php:105
-#: classes/Gems/Default/MailServerAction.php:88
msgid "Password"
msgstr "Password"
@@ -1225,7 +1224,8 @@
msgstr "Log maintenance"
#: classes/Gems/Default/MailAction.php:61
-#: classes/Gems/Default/MailLogAction.php:71
+#: classes/Gems/Default/MailLogAction.php:95
+#: classes/Gems/Default/MailLogActionOldStyle.php:118
msgid "Subject"
msgstr "Subject"
@@ -1243,22 +1243,47 @@
msgid "Email templates"
msgstr "Email templates"
-#: classes/Gems/Default/MailLogAction.php:69
-msgid "To"
-msgstr "To"
-
-#: classes/Gems/Default/MailLogAction.php:70
-msgid "From"
-msgstr "From"
-
-#: classes/Gems/Default/MailLogAction.php:72
+#: classes/Gems/Default/MailLogAction.php:89
+#: classes/Gems/Default/MailLogActionOldStyle.php:112
msgid "Date sent"
msgstr "Date sent"
-#: classes/Gems/Default/MailLogAction.php:80
+#: classes/Gems/Default/MailLogAction.php:90
+#: classes/Gems/Default/MailLogActionOldStyle.php:113
+msgid "Receiver"
+msgstr "Receiver"
+
+#: classes/Gems/Default/MailLogAction.php:91
+#: classes/Gems/Default/MailLogActionOldStyle.php:114
+msgid "To address"
+msgstr "To address"
+
+#: classes/Gems/Default/MailLogAction.php:92
+#: classes/Gems/Default/MailLogActionOldStyle.php:115
+msgid "Sender"
+msgstr "Sender"
+
+#: classes/Gems/Default/MailLogAction.php:93
+#: classes/Gems/Default/MailLogActionOldStyle.php:116
+msgid "From address"
+msgstr "From address"
+
+#: classes/Gems/Default/MailLogAction.php:98
+#: classes/Gems/Default/MailLogActionOldStyle.php:121
+msgid "Template"
+msgstr "Template"
+
+#: classes/Gems/Default/MailLogAction.php:108
+#: classes/Gems/Default/MailLogActionOldStyle.php:148
msgid "Mail Activity Log"
msgstr "Mail Activity Log"
+#: classes/Gems/Default/MailLogActionOldStyle.php:137
+msgid "Activity Log"
+msgid_plural "Activity Logs"
+msgstr[0] "Activity Log"
+msgstr[1] "Activity Logs"
+
#: classes/Gems/Default/MailServerAction.php:68
msgid "From address [part]"
msgstr "From address [part]"
@@ -1300,10 +1325,16 @@
msgstr "User ID"
#: classes/Gems/Default/MailServerAction.php:90
+#: classes/Gems/Default/OptionAction.php:107
+#: classes/Gems/Default/OptionAction.php:112
+#: classes/Gems/Default/SourceAction.php:95
+#: classes/Gems/Default/StaffAction.php:114
msgid "Repeat password"
msgstr "Repeat password"
#: classes/Gems/Default/MailServerAction.php:91
+#: classes/Gems/Default/SourceAction.php:74
+#: classes/Gems/Default/StaffAction.php:99
msgid "Enter only when changing"
msgstr "Enter only when changing the password"
@@ -1319,7 +1350,7 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
-#: classes/Gems/Default/RespondentAction.php:164
+#: classes/Gems/Default/RespondentAction.php:173
#: classes/Gems/Default/StaffAction.php:192
msgid "Language"
msgstr "Language"
@@ -1436,7 +1467,7 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
#: classes/Gems/Default/SurveyAction.php:203
-#: classes/Gems/Default/SurveyMaintenanceAction.php:424
+#: classes/Gems/Default/SurveyMaintenanceAction.php:425
msgid "survey"
msgid_plural "surveys"
msgstr[0] "survey"
@@ -1553,10 +1584,15 @@
msgid "By"
msgstr "By"
+#: classes/Gems/Default/ProjectSurveysAction.php:69
+#: classes/Gems/Default/ProjectTracksAction.php:67
+#: classes/Gems/Default/SurveyAction.php:193
+msgid "From"
+msgstr "From"
+
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
#: classes/Gems/Default/SurveyAction.php:195
-#: classes/Gems/Default/TrackAction.php:331
msgid "Until"
msgstr "Until"
@@ -1565,12 +1601,10 @@
msgstr "Active surveys"
#: classes/Gems/Default/ProjectTracksAction.php:65
-#: classes/Gems/Default/TrackAction.php:328
msgid "Survey #"
msgstr "Survey #"
#: classes/Gems/Default/ProjectTracksAction.php:85
-#: classes/Gems/Default/TrackAction.php:451
msgid "track"
msgid_plural "tracks"
msgstr[0] "track"
@@ -1666,114 +1700,106 @@
msgstr[0] "reception code"
msgstr[1] "reception codes"
-#: classes/Gems/Default/RespondentAction.php:113
+#: classes/Gems/Default/RespondentAction.php:122
msgid "Enter a 9-digit BSN number."
msgstr "Enter a 9-digit BSN number."
-#: classes/Gems/Default/RespondentAction.php:122
+#: classes/Gems/Default/RespondentAction.php:131
msgid "Identification"
msgstr "Identification"
-#: classes/Gems/Default/RespondentAction.php:123
+#: classes/Gems/Default/RespondentAction.php:132
msgid "BSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:136
msgid "Patient number"
msgstr "Patient number"
-#: classes/Gems/Default/RespondentAction.php:136
+#: classes/Gems/Default/RespondentAction.php:145
msgid "Medical data"
msgstr "Medical data"
-#: classes/Gems/Default/RespondentAction.php:143
+#: classes/Gems/Default/RespondentAction.php:152
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:146
+#: classes/Gems/Default/RespondentAction.php:155
msgid "Contact information"
msgstr "Contact information"
-#: classes/Gems/Default/RespondentAction.php:151
+#: classes/Gems/Default/RespondentAction.php:160
msgid "Respondent has no e-mail"
msgstr "Patient has no e-mail"
-#: classes/Gems/Default/RespondentAction.php:152
+#: classes/Gems/Default/RespondentAction.php:161
msgid "With housenumber"
msgstr "With housenumber"
-#: classes/Gems/Default/RespondentAction.php:159
+#: classes/Gems/Default/RespondentAction.php:168
msgid "Country"
msgstr "Country"
-#: classes/Gems/Default/RespondentAction.php:163
+#: classes/Gems/Default/RespondentAction.php:172
msgid "Settings"
msgstr "Settings"
-#: classes/Gems/Default/RespondentAction.php:165
+#: classes/Gems/Default/RespondentAction.php:174
msgid "Has the respondent signed the informed consent letter?"
msgstr "Has the patient signed the informed consent letter?"
-#: classes/Gems/Default/RespondentAction.php:190
+#: classes/Gems/Default/RespondentAction.php:199
msgid "Comments"
msgstr "Comments"
-#: classes/Gems/Default/RespondentAction.php:191
+#: classes/Gems/Default/RespondentAction.php:200
msgid "Physician"
msgstr "Physician"
-#: classes/Gems/Default/RespondentAction.php:192
+#: classes/Gems/Default/RespondentAction.php:201
msgid "Treatment"
msgstr "Treatment"
-#: classes/Gems/Default/RespondentAction.php:221
-#: classes/Gems/Default/TrackAction.php:131
-#: classes/Gems/Default/TrackAction.php:475
+#: classes/Gems/Default/RespondentAction.php:230
msgid "Rejection code"
msgstr "Rejection code"
-#: classes/Gems/Default/RespondentAction.php:228
+#: classes/Gems/Default/RespondentAction.php:237
msgid "Delete respondent"
msgstr "Delete patient"
-#: classes/Gems/Default/RespondentAction.php:279
+#: classes/Gems/Default/RespondentAction.php:288
msgid "Respondent deleted."
msgstr "Patient deleted"
-#: classes/Gems/Default/RespondentAction.php:282
-#: classes/Gems/Default/TrackAction.php:404
+#: classes/Gems/Default/RespondentAction.php:291
msgid "Choose a reception code to delete."
msgstr "Choose a reception code to delete."
-#: classes/Gems/Default/RespondentAction.php:346
+#: classes/Gems/Default/RespondentAction.php:355
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patient"
msgstr[1] "patients"
-#: classes/Gems/Default/RespondentAction.php:386
+#: classes/Gems/Default/RespondentAction.php:395
msgid "Please settle the informed consent form for this respondent."
msgstr "Please settle the informed consent form for this patient."
#: classes/Gems/Default/RespondentPlanAction.php:67
#: classes/Gems/Default/SurveyAction.php:171
-#: classes/Gems/Default/TrackAction.php:296
msgid "Show respondent"
msgstr "Show patient"
#: classes/Gems/Default/RespondentPlanAction.php:73
-#: classes/Gems/Default/TrackAction.php:265
-#: classes/Gems/Default/TrackAction.php:284
msgid "Show track"
msgstr "Show track"
#: classes/Gems/Default/RespondentPlanAction.php:136
-#: classes/Gems/Default/TrackAction.php:316
msgid " of "
msgstr " of "
#: classes/Gems/Default/RespondentPlanAction.php:137
-#: classes/Gems/Default/TrackAction.php:317
msgid "Progress"
msgstr "Progress"
@@ -1965,95 +1991,95 @@
msgid "Assigned surveys"
msgstr "Assigned surveys"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:129
+#: classes/Gems/Default/SurveyMaintenanceAction.php:130
msgid "If empty, survey will never show up!"
msgstr "If empty, survey will never show up!"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:130
+#: classes/Gems/Default/SurveyMaintenanceAction.php:131
msgid "Result field"
msgstr "Result field"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:131
+#: classes/Gems/Default/SurveyMaintenanceAction.php:132
msgid "Before answering"
msgstr "Before answering"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:132
+#: classes/Gems/Default/SurveyMaintenanceAction.php:133
msgid "After completion"
msgstr "After completion"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:135
+#: classes/Gems/Default/SurveyMaintenanceAction.php:136
msgid "Upload new PDF"
msgstr "Upload new PDF"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:142
+#: classes/Gems/Default/SurveyMaintenanceAction.php:143
msgid "Usage"
msgstr "Usage"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:157
+#: classes/Gems/Default/SurveyMaintenanceAction.php:158
msgid "Single Survey Assignment"
msgstr "Single Survey Assignment"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:202
+#: classes/Gems/Default/SurveyMaintenanceAction.php:203
msgid "Assignable since"
msgstr "Assignable since"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:203
+#: classes/Gems/Default/SurveyMaintenanceAction.php:204
msgid "Assignable until"
msgstr "Assignable until"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:209
+#: classes/Gems/Default/SurveyMaintenanceAction.php:210
msgid "Create Single Survey"
msgstr "Create Single Survey"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:213
+#: classes/Gems/Default/SurveyMaintenanceAction.php:214
msgid "At the moment this survey can only be assigned to respondents as part of an existing track."
msgstr "At the moment this survey can only be assigned to paitents as part of an existing track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:266
+#: classes/Gems/Default/SurveyMaintenanceAction.php:267
msgid "Survey should be assigned to a group before making it active."
msgstr "Survey should be assigned to a group before making it active."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:279
+#: classes/Gems/Default/SurveyMaintenanceAction.php:280
#, php-format
msgid "Checking survey results for the %s survey."
msgstr "Checking survey results for the %s survey."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:354
+#: classes/Gems/Default/SurveyMaintenanceAction.php:355
msgid "Source"
msgstr "Source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:355
+#: classes/Gems/Default/SurveyMaintenanceAction.php:356
msgid "Status in source"
msgstr "Status in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:359
+#: classes/Gems/Default/SurveyMaintenanceAction.php:360
msgid "Active in source"
msgstr "Active in source"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:360
+#: classes/Gems/Default/SurveyMaintenanceAction.php:361
#, php-format
msgid "Active in %s"
msgstr "Active in %s"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:367
+#: classes/Gems/Default/SurveyMaintenanceAction.php:368
msgid "Single"
msgstr "Single"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:409
+#: classes/Gems/Default/SurveyMaintenanceAction.php:410
#, php-format
msgid "%d times in track."
msgstr "%d times in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:411
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
#, php-format
msgid "%d times in %d track(s)."
msgstr "%d times in %d track(s)."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:415
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
msgid "Not used in track."
msgstr "Not used in track."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
msgid "Not used in tracks."
msgstr "Not used in tracks."
@@ -2153,7 +2179,6 @@
msgstr "+"
#: classes/Gems/Default/TokenPlanAction.php:478
-#: classes/Gems/Default/TrackAction.php:449
msgid "token"
msgid_plural "tokens"
msgstr[0] "token"
@@ -2380,10 +2405,6 @@
msgid "Preview text"
msgstr "Preview text"
-#: classes/Gems/Email/EmailFormAbstract.php:306
-msgid "Template"
-msgstr "Template"
-
#: classes/Gems/Email/EmailFormAbstract.php:330
msgid "Send"
msgstr "Send"
@@ -2445,6 +2466,11 @@
msgid "Method"
msgstr "Method"
+#: classes/Gems/Email/MultiMailForm.php:105
+#: classes/Gems/Email/OneMailForm.php:87
+msgid "To"
+msgstr "To"
+
#: classes/Gems/Email/MultiMailForm.php:126
msgid "Survey has been taken."
msgstr "Survey has been taken."
@@ -2470,12 +2496,12 @@
msgid "The sending of emails was blocked for this installation."
msgstr "The sending of emails was blocked for this installation."
-#: classes/Gems/Email/OneMailForm.php:139
+#: classes/Gems/Email/OneMailForm.php:140
#: classes/Gems/Email/TemplateMailer.php:244
msgid "Mail failed to send."
msgstr "Mail failed to send."
-#: classes/Gems/Email/OneMailForm.php:143
+#: classes/Gems/Email/OneMailForm.php:144
#, php-format
msgid "Sent email to %s."
msgstr "Sent email to %s."
@@ -3416,12 +3442,10 @@
msgstr "Recalculate track"
#: snippets/RespondentDetailsSnippet.php:59
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:74
msgid "Respondent information"
msgstr "Patient information"
#: snippets/RespondentDetailsSnippet.php:71
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:97
msgid "Respondent nr: "
msgstr "Patient nr:"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2011-09-20 14:55:25 UTC (rev 50)
+++ trunk/library/languages/default-nl.po 2011-09-20 15:42:08 UTC (rev 51)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Pulse NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-19 18:16+0100\n"
+"POT-Creation-Date: 2011-09-20 17:37+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
@@ -1069,7 +1069,6 @@
msgstr "Gebruikersnaam"
#: classes/Gems/Default/IndexAction.php:105
-#: classes/Gems/Default/MailServerAction.php:88
msgid "Password"
msgstr "Wachtwoord"
@@ -1225,7 +1224,8 @@
msgstr "Logboek onderhoud"
#: classes/Gems/Default/MailAction.php:61
-#: classes/Gems/Default/MailLogAction.php:71
+#: classes/Gems/Default/MailLogAction.php:95
+#: classes/Gems/Default/MailLogActionOldStyle.php:118
msgid "Subject"
msgstr "Onderwerp"
@@ -1243,22 +1243,47 @@
msgid "Email templates"
msgstr "Email sjabloon"
-#: classes/Gems/Default/MailLogAction.php:69
-msgid "To"
-msgstr "Aan"
+#: classes/Gems/Default/MailLogAction.php:89
+#: classes/Gems/Default/MailLogActionOldStyle.php:112
+msgid "Date sent"
+msgstr "Verzend datum"
-#: classes/Gems/Default/MailLogAction.php:70
-msgid "From"
-msgstr "Van"
+#: classes/Gems/Default/MailLogAction.php:90
+#: classes/Gems/Default/MailLogActionOldStyle.php:113
+msgid "Receiver"
+msgstr "Ontvanger"
-#: classes/Gems/Default/MailLogAction.php:72
-msgid "Date sent"
-msgstr "Datum verstuurd"
+#: classes/Gems/Default/MailLogAction.php:91
+#: classes/Gems/Default/MailLogActionOldStyle.php:114
+msgid "To address"
+msgstr "Adres aan"
-#: classes/Gems/Default/MailLogAction.php:80
+#: classes/Gems/Default/MailLogAction.php:92
+#: classes/Gems/Default/MailLogActionOldStyle.php:115
+msgid "Sender"
+msgstr "Verzender"
+
+#: classes/Gems/Default/MailLogAction.php:93
+#: classes/Gems/Default/MailLogActionOldStyle.php:116
+msgid "From address"
+msgstr "Adres van"
+
+#: classes/Gems/Default/MailLogAction.php:98
+#: classes/Gems/Default/MailLogActionOldStyle.php:121
+msgid "Template"
+msgstr "Sjabloon"
+
+#: classes/Gems/Default/MailLogAction.php:108
+#: classes/Gems/Default/MailLogActionOldStyle.php:148
msgid "Mail Activity Log"
msgstr "Logboek Mail Activiteit"
+#: classes/Gems/Default/MailLogActionOldStyle.php:137
+msgid "Activity Log"
+msgid_plural "Activity Logs"
+msgstr[0] "Mail Activiteit Log"
+msgstr[1] "Mail Activiteiten Logs"
+
#: classes/Gems/Default/MailServerAction.php:68
msgid "From address [part]"
msgstr "Vanaf adres [gedeelte]"
@@ -1300,10 +1325,16 @@
msgstr "Gebruikers ID"
#: classes/Gems/Default/MailServerAction.php:90
+#: classes/Gems/Default/OptionAction.php:107
+#: classes/Gems/Default/OptionAction.php:112
+#: classes/Gems/Default/SourceAction.php:95
+#: classes/Gems/Default/StaffAction.php:114
msgid "Repeat password"
msgstr "Herhaal wachtwoord"
#: classes/Gems/Default/MailServerAction.php:91
+#: classes/Gems/Default/SourceAction.php:74
+#: classes/Gems/Default/StaffAction.php:99
msgid "Enter only when changing"
msgstr "Alleen invoeren om het wachtwoord te wijzigen"
@@ -1319,7 +1350,7 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
-#: classes/Gems/Default/RespondentAction.php:164
+#: classes/Gems/Default/RespondentAction.php:173
#: classes/Gems/Default/StaffAction.php:192
msgid "Language"
msgstr "Taal"
@@ -1436,7 +1467,7 @@
#: classes/Gems/Default/OverviewPlanAction.php:115
#: classes/Gems/Default/ProjectSurveysAction.php:88
#: classes/Gems/Default/SurveyAction.php:203
-#: classes/Gems/Default/SurveyMaintenanceAction.php:424
+#: classes/Gems/Default/SurveyMaintenanceAction.php:425
msgid "survey"
msgid_plural "surveys"
msgstr[0] "vragenlijst"
@@ -1553,10 +1584,15 @@
msgid "By"
msgstr "Door"
+#: classes/Gems/Default/ProjectSurveysAction.php:69
+#: classes/Gems/Default/ProjectTracksAction.php:67
+#: classes/Gems/Default/SurveyAction.php:193
+msgid "From"
+msgstr "Van"
+
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
#: classes/Gems/Default/SurveyAction.php:195
-#: classes/Gems/Default/TrackAction.php:331
msgid "Until"
msgstr "Tot"
@@ -1565,12 +1601,10 @@
msgstr "Beschikbare vragenlijsten"
#: classes/Gems/Default/ProjectTracksAction.php:65
-#: classes/Gems/Default/TrackAction.php:328
msgid "Survey #"
msgstr "Vragenlijsten"
#: classes/Gems/Default/ProjectTracksAction.php:85
-#: classes/Gems/Default/TrackAction.php:451
msgid "track"
msgid_plural "tracks"
msgstr[0] "traject"
@@ -1666,114 +1700,106 @@
msgstr[0] "Ontvangst code"
msgstr[1] "Ontvangst code"
-#: classes/Gems/Default/RespondentAction.php:113
+#: classes/Gems/Default/RespondentAction.php:122
msgid "Enter a 9-digit BSN number."
msgstr "Voer een BSN nummer van 9 cijfers in."
-#: classes/Gems/Default/RespondentAction.php:122
+#: classes/Gems/Default/RespondentAction.php:131
msgid "Identification"
msgstr "Identificatie"
-#: classes/Gems/Default/RespondentAction.php:123
+#: classes/Gems/Default/RespondentAction.php:132
msgid "BSN"
msgstr "BSN"
-#: classes/Gems/Default/RespondentAction.php:127
+#: classes/Gems/Default/RespondentAction.php:136
msgid "Patient number"
msgstr "Patiënt nummer"
-#: classes/Gems/Default/RespondentAction.php:136
+#: classes/Gems/Default/RespondentAction.php:145
msgid "Medical data"
msgstr "Medische gegevens"
-#: classes/Gems/Default/RespondentAction.php:143
+#: classes/Gems/Default/RespondentAction.php:152
msgid "DBC's, etc..."
msgstr "DBC's, etc..."
-#: classes/Gems/Default/RespondentAction.php:146
+#: classes/Gems/Default/RespondentAction.php:155
msgid "Contact information"
msgstr "Contact informatie"
-#: classes/Gems/Default/RespondentAction.php:151
+#: classes/Gems/Default/RespondentAction.php:160
msgid "Respondent has no e-mail"
msgstr "Patiënt zonder e-mail"
-#: classes/Gems/Default/RespondentAction.php:152
+#: classes/Gems/Default/RespondentAction.php:161
msgid "With housenumber"
msgstr "Met huisnummer"
-#: classes/Gems/Default/RespondentAction.php:159
+#: classes/Gems/Default/RespondentAction.php:168
msgid "Country"
msgstr "Land"
-#: classes/Gems/Default/RespondentAction.php:163
+#: classes/Gems/Default/RespondentAction.php:172
msgid "Settings"
msgstr "Instellingen"
-#: classes/Gems/Default/RespondentAction.php:165
+#: classes/Gems/Default/RespondentAction.php:174
msgid "Has the respondent signed the informed consent letter?"
msgstr "Heeft de patiënt het \"informed consent\" formulier ondertekend?"
-#: classes/Gems/Default/RespondentAction.php:190
+#: classes/Gems/Default/RespondentAction.php:199
msgid "Comments"
msgstr "Opmerkingen"
-#: classes/Gems/Default/RespondentAction.php:191
+#: classes/Gems/Default/RespondentAction.php:200
msgid "Physician"
msgstr "Dokter"
-#: classes/Gems/Default/RespondentAction.php:192
+#: classes/Gems/Default/RespondentAction.php:201
msgid "Treatment"
msgstr "Behandeling"
-#: classes/Gems/Default/RespondentAction.php:221
-#: classes/Gems/Default/TrackAction.php:131
-#: classes/Gems/Default/TrackAction.php:475
+#: classes/Gems/Default/RespondentAction.php:230
msgid "Rejection code"
msgstr "Afkeuringscode"
-#: classes/Gems/Default/RespondentAction.php:228
+#: classes/Gems/Default/RespondentAction.php:237
msgid "Delete respondent"
msgstr "Verwijder patiënt"
-#: classes/Gems/Default/RespondentAction.php:279
+#: classes/Gems/Default/RespondentAction.php:288
msgid "Respondent deleted."
msgstr "Patiënt verwijderd"
-#: classes/Gems/Default/RespondentAction.php:282
-#: classes/Gems/Default/TrackAction.php:404
+#: classes/Gems/Default/RespondentAction.php:291
msgid "Choose a reception code to delete."
msgstr "Kies een ontvangst code om te verwijderen."
-#: classes/Gems/Default/RespondentAction.php:346
+#: classes/Gems/Default/RespondentAction.php:355
msgid "respondent"
msgid_plural "respondents"
msgstr[0] "patiënt"
msgstr[1] "patiënten"
-#: classes/Gems/Default/RespondentAction.php:386
+#: classes/Gems/Default/RespondentAction.php:395
msgid "Please settle the informed consent form for this respondent."
msgstr "A.u.b. het informed consent formulier doornemen met deze patiënt"
#: classes/Gems/Default/RespondentPlanAction.php:67
#: classes/Gems/Default/SurveyAction.php:171
-#: classes/Gems/Default/TrackAction.php:296
msgid "Show respondent"
msgstr "Toon patiënt"
#: classes/Gems/Default/RespondentPlanAction.php:73
-#: classes/Gems/Default/TrackAction.php:265
-#: classes/Gems/Default/TrackAction.php:284
msgid "Show track"
msgstr "Toon traject"
#: classes/Gems/Default/RespondentPlanAction.php:136
-#: classes/Gems/Default/TrackAction.php:316
msgid " of "
msgstr " van "
#: classes/Gems/Default/RespondentPlanAction.php:137
-#: classes/Gems/Default/TrackAction.php:317
msgid "Progress"
msgstr "Voortgang"
@@ -1965,95 +1991,95 @@
msgid "Assigned surveys"
msgstr "Toegewezen vragenlijsten"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:129
+#: classes/Gems/Default/SurveyMaintenanceAction.php:130
msgid "If empty, survey will never show up!"
msgstr "Indien leeg zal de vragenlijst niet tevoorschijn komen!"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:130
+#: classes/Gems/Default/SurveyMaintenanceAction.php:131
msgid "Result field"
msgstr "Resultaat veld"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:131
+#: classes/Gems/Default/SurveyMaintenanceAction.php:132
msgid "Before answering"
msgstr "Voor beantwoording"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:132
+#: classes/Gems/Default/SurveyMaintenanceAction.php:133
msgid "After completion"
msgstr "Na afronding"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:135
+#: classes/Gems/Default/SurveyMaintenanceAction.php:136
msgid "Upload new PDF"
msgstr "Upload nieuwe PDF"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:142
+#: classes/Gems/Default/SurveyMaintenanceAction.php:143
msgid "Usage"
msgstr "Gebruik"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:157
+#: classes/Gems/Default/SurveyMaintenanceAction.php:158
msgid "Single Survey Assignment"
msgstr "Losse vragenlijst toewijzing"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:202
+#: classes/Gems/Default/SurveyMaintenanceAction.php:203
msgid "Assignable since"
msgstr "Toewijsbaar sinds"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:203
+#: classes/Gems/Default/SurveyMaintenanceAction.php:204
msgid "Assignable until"
msgstr "Toewijsbaar tot"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:209
+#: classes/Gems/Default/SurveyMaintenanceAction.php:210
msgid "Create Single Survey"
msgstr "Maak losse vragenlijst"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:213
+#: classes/Gems/Default/SurveyMaintenanceAction.php:214
msgid "At the moment this survey can only be assigned to respondents as part of an existing track."
msgstr "Op dit moment kan deze vragenlijst alleen aan patiënten toegewezen als onderdeel van een traject."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:266
+#: classes/Gems/Default/SurveyMaintenanceAction.php:267
msgid "Survey should be assigned to a group before making it active."
msgstr "Vragenlijst moet aan een groep toegewezen worden voordat deze actief kan worden gemaakt."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:279
+#: classes/Gems/Default/SurveyMaintenanceAction.php:280
#, php-format
msgid "Checking survey results for the %s survey."
msgstr "Controle op vragenlijstresultaten voor de vragenlijst '%s'."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:354
+#: classes/Gems/Default/SurveyMaintenanceAction.php:355
msgid "Source"
msgstr "Bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:355
+#: classes/Gems/Default/SurveyMaintenanceAction.php:356
msgid "Status in source"
msgstr "Status in bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:359
+#: classes/Gems/Default/SurveyMaintenanceAction.php:360
msgid "Active in source"
msgstr "Actief in bron"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:360
+#: classes/Gems/Default/SurveyMaintenanceAction.php:361
#, php-format
msgid "Active in %s"
msgstr "Actief in %s"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:367
+#: classes/Gems/Default/SurveyMaintenanceAction.php:368
msgid "Single"
msgstr "Los"
-#: classes/Gems/Default/SurveyMaintenanceAction.php:409
+#: classes/Gems/Default/SurveyMaintenanceAction.php:410
#, php-format
msgid "%d times in track."
msgstr "%d keer in traject."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:411
+#: classes/Gems/Default/SurveyMaintenanceAction.php:412
#, php-format
msgid "%d times in %d track(s)."
msgstr "%d keer in %d traject(en)."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:415
+#: classes/Gems/Default/SurveyMaintenanceAction.php:416
msgid "Not used in track."
msgstr "Niet in traject gebruikt."
-#: classes/Gems/Default/SurveyMaintenanceAction.php:417
+#: classes/Gems/Default/SurveyMaintenanceAction.php:418
msgid "Not used in tracks."
msgstr "Niet in trajecten gebruikt."
@@ -2153,7 +2179,6 @@
msgstr "+"
#: classes/Gems/Default/TokenPlanAction.php:478
-#: classes/Gems/Default/TrackAction.php:449
msgid "token"
msgid_plural "tokens"
msgstr[0] "kenmerk"
@@ -2380,10 +2405,6 @@
msgid "Preview text"
msgstr "Tekstvoorbeeld"
-#: classes/Gems/Email/EmailFormAbstract.php:306
-msgid "Template"
-msgstr "Sjabloon"
-
#: classes/Gems/Email/EmailFormAbstract.php:330
msgid "Send"
msgstr "Verstuur"
@@ -2445,6 +2466,11 @@
msgid "Method"
msgstr "Methode"
+#: classes/Gems/Email/MultiMailForm.php:105
+#: classes/Gems/Email/OneMailForm.php:87
+msgid "To"
+msgstr "Aan"
+
#: classes/Gems/Email/MultiMailForm.php:126
msgid "Survey has been taken."
msgstr "Vragenlijsten is al afgenomen"
@@ -2470,12 +2496,12 @@
msgid "The sending of emails was blocked for this installation."
msgstr "Het versturen van emails is geblokkeerd in deze installatie."
-#: classes/Gems/Email/OneMailForm.php:139
+#: classes/Gems/Email/OneMailForm.php:140
#: classes/Gems/Email/TemplateMailer.php:244
msgid "Mail failed to send."
msgstr "Mail sturen mislukt."
-#: classes/Gems/Email/OneMailForm.php:143
+#: classes/Gems/Email/OneMailForm.php:144
#, php-format
msgid "Sent email to %s."
msgstr "Email naar %s verzonden."
@@ -3416,12 +3442,10 @@
msgstr "Berekening traject opnieuw"
#: snippets/RespondentDetailsSnippet.php:59
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:74
msgid "Respondent information"
msgstr "Patiënt informatie"
#: snippets/RespondentDetailsSnippet.php:71
-#: snippets/RespondentDetailsWithAssignmentsSnippet.php:97
msgid "Respondent nr: "
msgstr "Patiënt nr:"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 14:55:36
|
Revision: 50
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=50&view=rev
Author: mennodekker
Date: 2011-09-20 14:55:25 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Fixing pdf upload / display?
Modified Paths:
--------------
trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
Modified: trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-20 13:47:14 UTC (rev 49)
+++ trunk/library/classes/Gems/Default/SurveyMaintenanceAction.php 2011-09-20 14:55:25 UTC (rev 50)
@@ -93,7 +93,8 @@
*/
protected function addFormElements(MUtil_Model_FormBridge $bridge, MUtil_Model_ModelAbstract $model, array $data, $new = false)
{
- // MUtil_Echo::r($data, __CLASS__ . '->' . __FUNCTION__);
+ //MUtil_Echo::r($data, __CLASS__ . '->' . __FUNCTION__);
+ $data = array_merge($model->loadFirst(), $data);
// Prepare variables
$currentId = $data['gsu_id_survey'];
@@ -436,8 +437,11 @@
public function setMenuParameter($data)
{
+ $source = $this->menu->getParameterSource();
+ $source->offsetSet('gsu_has_pdf', $data['gsu_survey_pdf'] ? 1 : 0);
+ $source->offsetSet(MUtil_Model::REQUEST_ID, $data['gsu_id_survey']);
+ $this->data['gsu_has_pdf'] = $data['gsu_survey_pdf'] ? 1 : 0;
$this->data[MUtil_Model::REQUEST_ID] = $data['gsu_id_survey'];
- $this->data['gsu_has_pdf'] = $data['gsu_survey_pdf'] ? 1 : 0;
return $this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 13:47:23
|
Revision: 49
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=49&view=rev
Author: mennodekker
Date: 2011-09-20 13:47:14 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Some more print fixes
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems_print.css
Modified: trunk/new_project/htdocs/gems/css/gems_print.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems_print.css 2011-09-20 13:37:54 UTC (rev 48)
+++ trunk/new_project/htdocs/gems/css/gems_print.css 2011-09-20 13:47:14 UTC (rev 49)
@@ -4,8 +4,13 @@
font-family: Arial,Verdana,Helvetica,Sans-serif;
}
- #header_bar, #menu, .noprint, a.actionlink { display: none; }
+ #header_bar, #menu, .noprint, a.actionlink,
+ span.tooltip, span.thetooltip,
+ .button, button,
+ .ui-tabs-nav-item { display: none; }
+ p.description { display: inline; }
+
table {
border-collapse: collapse;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 13:38:03
|
Revision: 48
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=48&view=rev
Author: mennodekker
Date: 2011-09-20 13:37:54 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Added some of the recent updates to the changelog
Modified Paths:
--------------
trunk/library/changelog.txt
Modified: trunk/library/changelog.txt
===================================================================
--- trunk/library/changelog.txt 2011-09-20 13:04:31 UTC (rev 47)
+++ trunk/library/changelog.txt 2011-09-20 13:37:54 UTC (rev 48)
@@ -1,3 +1,12 @@
+Important changes from 1.4.1 => 1.4.2
+============================================================
+ * To have an autosubmit form it is enough now to just use $form->setAutoSubmit($href, $targetId)
+ * Introduced Gems_FormattedData, which takes a model and array of data and applies all formatting rules to the data
+ (see export for more info)
+ * The menu is reorganised and some items no longers have privileges assigned to them. Be careful with project menus!
+ * Tooltip decorator now uses jQuery icon instead of an image
+ * Print view of tab-forms now output the tab-titles for better readability, this introduced the class print-only
+
Important changes from 1.4 => 1.4.1
============================================================
* Menu containers no longer have a privilege, this could have impact on custom menu's searching for a container.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 13:04:42
|
Revision: 47
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=47&view=rev
Author: mennodekker
Date: 2011-09-20 13:04:31 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Improved printing of tab-forms: the tab-title now displays above the tab (in print only)
Modified Paths:
--------------
trunk/library/classes/Gems/JQuery/View/Helper/TabContainer.php
trunk/new_project/htdocs/gems/css/gems-new.css
trunk/new_project/htdocs/gems/css/gems.css
trunk/new_project/htdocs/gems/css/gems_print.css
Modified: trunk/library/classes/Gems/JQuery/View/Helper/TabContainer.php
===================================================================
--- trunk/library/classes/Gems/JQuery/View/Helper/TabContainer.php 2011-09-20 12:32:55 UTC (rev 46)
+++ trunk/library/classes/Gems/JQuery/View/Helper/TabContainer.php 2011-09-20 13:04:31 UTC (rev 47)
@@ -92,6 +92,7 @@
$list .= '<li class="ui-tabs-nav-item' . $class . '"><a href="'.$opts['contentUrl'].'"><span>'.$v['name'].'</span></a></li>'.PHP_EOL;
} else {
$list .= '<li class="ui-tabs-nav-item' . $class . '"><a href="#'.$frag_name.'"><span>'.$v['name'].'</span></a></li>'.PHP_EOL;
+ $html .= '<h3 class="print-only">' . $v['name'] . '</h3>'; /* For printing of tab forms */
$html .= '<div id="'.$frag_name.'" class="ui-tabs-panel">'.$v['content'].'</div>'.PHP_EOL;
}
}
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 12:32:55 UTC (rev 46)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 13:04:31 UTC (rev 47)
@@ -379,6 +379,8 @@
margin: 0.5em;
}
+.print-only { display: none; }
+
.rightAlign {
text-align: right;
}
@@ -658,4 +660,4 @@
span.thetooltip {
display: none;
-}
\ No newline at end of file
+}
Modified: trunk/new_project/htdocs/gems/css/gems.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems.css 2011-09-20 12:32:55 UTC (rev 46)
+++ trunk/new_project/htdocs/gems/css/gems.css 2011-09-20 13:04:31 UTC (rev 47)
@@ -335,6 +335,8 @@
margin: 0.5em;
}
+.print-only { display: none; }
+
.rightAlign {
text-align: right;
}
Modified: trunk/new_project/htdocs/gems/css/gems_print.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems_print.css 2011-09-20 12:32:55 UTC (rev 46)
+++ trunk/new_project/htdocs/gems/css/gems_print.css 2011-09-20 13:04:31 UTC (rev 47)
@@ -1,9 +1,9 @@
/* Style for printing, disables certain UI elements */
@media print {
body {
- font-family: Arial,Verdana,Helvetica,Sans-serif;
+ font-family: Arial,Verdana,Helvetica,Sans-serif;
}
-
+
#header_bar, #menu, .noprint, a.actionlink { display: none; }
table {
@@ -30,4 +30,6 @@
table.browser {
width: 100%;
}
+
+ .print-only { display: inline; }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 12:33:07
|
Revision: 46
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=46&view=rev
Author: mennodekker
Date: 2011-09-20 12:32:55 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 12:17:10 UTC (rev 45)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 12:32:55 UTC (rev 46)
@@ -525,7 +525,7 @@
border-top: 2px solid;
}
-table.timeTable th a {
+table.timeTable th a, table.timeTable td a {
color: inherit;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 12:17:20
|
Revision: 45
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=45&view=rev
Author: mennodekker
Date: 2011-09-20 12:17:10 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
some more css fixes
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 11:37:40 UTC (rev 44)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 12:17:10 UTC (rev 45)
@@ -462,7 +462,7 @@
padding: 0;
}
-table.browser, table.timeTable {
+table.displayer, table.browser, table.timeTable {
border-collapse: collapse;
border-spacing: 0;
clear: both;
@@ -529,10 +529,6 @@
color: inherit;
}
-table.timeTable td a, table.timeTable td a:hover {
- color: inherit;
-}
-
.tab-displaygroup {
float: left;
margin-right: 5px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 11:37:46
|
Revision: 44
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=44&view=rev
Author: mennodekker
Date: 2011-09-20 11:37:40 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Fixing full-width in the new layout system
Modified Paths:
--------------
trunk/library/layouts/scripts/gemsnew.phtml
trunk/new_project/htdocs/gems/css/gems-new.css
trunk/templates/erasmusmc/css/erasmusmc.css
Modified: trunk/library/layouts/scripts/gemsnew.phtml
===================================================================
--- trunk/library/layouts/scripts/gemsnew.phtml 2011-09-20 11:22:55 UTC (rev 43)
+++ trunk/library/layouts/scripts/gemsnew.phtml 2011-09-20 11:37:40 UTC (rev 44)
@@ -42,7 +42,7 @@
</div><?php
else:
?>
- <div id="wrapper" class="main">
+ <div id="wrapper" class="main fullwidth">
<div><?php
if ($this->main) {
echo $this->main->render($this);
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 11:22:55 UTC (rev 43)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 11:37:40 UTC (rev 44)
@@ -48,6 +48,10 @@
height: 1.2em;
}
+.fullwidth > div {
+ margin: 0px 5px; /* provide a little 'air' on full-width */
+}
+
/*
* END OF LAYOUT
*/
Modified: trunk/templates/erasmusmc/css/erasmusmc.css
===================================================================
--- trunk/templates/erasmusmc/css/erasmusmc.css 2011-09-20 11:22:55 UTC (rev 43)
+++ trunk/templates/erasmusmc/css/erasmusmc.css 2011-09-20 11:37:40 UTC (rev 44)
@@ -7,6 +7,7 @@
.main, .menu { background: #ffffff; }
.main { border-left: 1px solid #006; }
+.fullwidth.main { border-left: 0px;} /* remove for full width layout */
#header {
background: #ffffff url(../local/logo_erasmusmgz.gif) no-repeat;
@@ -18,7 +19,7 @@
#header_bar,
table.displayer caption,
.tabrow .tab,
-.tooldock,
+.tooldock,
.toolbox .toolanchor {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
@@ -30,12 +31,12 @@
/* shadow */
.tooldock,
-button,
+button,
input.button,
-a.actionlink,
-a.browselink,
+a.actionlink,
+a.browselink,
button.ui-datepicker-trigger,
-table.browser,
+table.browser,
table.timeTable
{
box-shadow: 2px 2px 4px #0C2074;
@@ -43,7 +44,7 @@
-webkit-box-shadow: 2px 2px 4px #0C2074;
}
-#header_bar,
+#header_bar,
.tooldock {
background: #6DC3F1;
}
@@ -83,7 +84,7 @@
button:hover, input.button:hover {
background: #0C2074 url(../local/button_hover.png) repeat-x left center;
border: 1px solid #0C2074;
- color: #ffffff;
+ color: #ffffff;
text-decoration: none;
}
@@ -106,7 +107,7 @@
a.actionlink:hover, a.browselink:hover, button:hover.small, button.ui-datepicker-trigger:hover, input.button.small:hover {
background: #0C2074 url(../local/imagelink_hover.png) repeat-x left center;
border: 1px solid #0C2074;
- color: #ffffff;
+ color: #ffffff;
text-decoration: none;
}
@@ -125,7 +126,7 @@
font-size: 80%;
height: 16px;
vertical-align: middle;
-}
+}
#autofilter_target table tbody td strong.marked {
border-left: 1px dotted;
@@ -139,7 +140,7 @@
h1, h2, h3, h4 {
color: #0C2074;
-}
+}
#header h1 {
background: url(../local/pulse.gif) repeat-x 0px 15px; /* play with the numbers to move the 'heartbeat' */
@@ -256,10 +257,10 @@
border-right: 2px solid #0C2074;
}
-table tfoot td.selectedColumn,
+table tfoot td.selectedColumn,
table tr.selectedRow td.selectedColumn,
table thead th.selectedColumn,
-table.timeTable td[onclick]:hover,
+table.timeTable td[onclick]:hover,
table.timeTable th[onclick]:hover {
border-color: #0C2074;
background-color: #0C2074;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 11:23:01
|
Revision: 43
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=43&view=rev
Author: mennodekker
Date: 2011-09-20 11:22:55 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Improved tooltip decorator to use the jquery theming
Modified Paths:
--------------
trunk/library/classes/Gems/Form/Decorator/Tooltip.php
Modified: trunk/library/classes/Gems/Form/Decorator/Tooltip.php
===================================================================
--- trunk/library/classes/Gems/Form/Decorator/Tooltip.php 2011-09-20 10:21:56 UTC (rev 42)
+++ trunk/library/classes/Gems/Form/Decorator/Tooltip.php 2011-09-20 11:22:55 UTC (rev 43)
@@ -2,7 +2,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -13,7 +13,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -24,7 +24,7 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* @package Gems
* @subpackage Form
* @copyright Copyright (c) 2011 Erasmus MC
@@ -101,7 +101,10 @@
public function getImg()
{
- return '<img src="' . Zend_Controller_Front::getInstance()->getBaseUrl() . '/gems/js/images/question_mark.gif">';
+ return '<div class="ui-button ui-button-text-only ui-widget ui-state-default ui-corner-all">
+ <span class="ui-icon ui-icon-help"></span>
+</div>';
+ //return '<img src="' . Zend_Controller_Front::getInstance()->getBaseUrl() . '/gems/js/images/question_mark.gif">';
}
/**
@@ -158,11 +161,11 @@
if (null === $view) {
return $content;
}
-
+
$tooltip = $element->getAttrib('tooltip');
$tooltip = trim($tooltip);
//$element->removeAttrib('tooltip');
-
+
if (empty($tooltip)) {
return $content;
}
@@ -170,17 +173,17 @@
$view->headScript()->appendFile(Zend_Controller_Front::getInstance()->getBaseUrl() . '/gems/js/jquery.cluetip.js');
$view->headLink()->appendStylesheet(Zend_Controller_Front::getInstance()->getBaseUrl() . '/gems/js/jquery.cluetip.css');
$script = "$('" . $this->getTag() . ".tooltip').cluetip({
- activation: 'click',
- sticky: 'true',
- closeText: '[X]',
+ activation: 'click',
+ sticky: 'true',
+ closeText: '[X]',
closePosition: 'title',
- width: 450,
- titleAttribute: 'tip',
+ width: 450,
+ titleAttribute: 'tip',
splitTitle: '|'})
$('#tabContainer').bind( 'tabsselect', function(event, ui) {
$(document).trigger('hideCluetip');
});";
-
+
$view->jQuery()->addOnLoad($script);
$separator = $this->getSeparator();
@@ -237,5 +240,5 @@
$this->_tag = (string) $tag;
return $this;
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 10:22:02
|
Revision: 42
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=42&view=rev
Author: mennodekker
Date: 2011-09-20 10:21:56 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Updated css to reflect changes made to tableelement (note: color changed from blue to red)
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
trunk/new_project/htdocs/gems/css/gems.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 10:21:15 UTC (rev 41)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-20 10:21:56 UTC (rev 42)
@@ -143,6 +143,7 @@
border: 1px solid;
}
+.tblSpecial,
.zend_echo,
.errors,
.ui-tabs-nav-item.taberror span {
Modified: trunk/new_project/htdocs/gems/css/gems.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems.css 2011-09-20 10:21:15 UTC (rev 41)
+++ trunk/new_project/htdocs/gems/css/gems.css 2011-09-20 10:21:56 UTC (rev 42)
@@ -90,6 +90,7 @@
}
/* #FFFF00 */
+.tblSpecial,
.errors,
.ui-tabs-nav-item.taberror span {
color: #DD0000;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-20 10:21:25
|
Revision: 41
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=41&view=rev
Author: mennodekker
Date: 2011-09-20 10:21:15 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Removed inline style for TableElement special value and used tblSpecial class
Modified Paths:
--------------
trunk/library/classes/MUtil/Html/TableElement.php
Modified: trunk/library/classes/MUtil/Html/TableElement.php
===================================================================
--- trunk/library/classes/MUtil/Html/TableElement.php 2011-09-19 16:29:20 UTC (rev 40)
+++ trunk/library/classes/MUtil/Html/TableElement.php 2011-09-20 10:21:15 UTC (rev 41)
@@ -1,34 +1,34 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
+
/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
* @author Matijs de Jong
* @since 1.0
* @version 1.4
@@ -38,7 +38,7 @@
/**
* TableElement is an extension of HtmlElement that add's a lot of table specific extra functionality
- *
+ *
* @author Matijs de Jong
* @package MUtil
* @subpackage Html
@@ -53,11 +53,11 @@
const TBODY = 'tbody';
const TFOOT = 'tfoot';
const THEAD = 'thead';
-
+
/**
* Rendering constants for displaying special values in static createX and renderX functions
*/
-
+
/**
* Constant for displaying circular reference in static createX and renderX functions
*/
@@ -86,20 +86,20 @@
/**
* Constant for start of display of any special type of value in static createX and renderX functions
*/
- const RENDER_OPEN = '<span style="color: blue;">';
-
+ const RENDER_OPEN = '<span class="tblSpecial">';
+
/**
* All new content is added to the last (tbody) element.
- *
+ *
* @var boolean When true new content not having a $_allowedChildTags is added to $_lastChild.
*/
protected $_addtoLastChild = true;
/**
- * Of course strictly speaking a row is allowed as well,
- * but there is no need to support independent rows and
+ * Of course strictly speaking a row is allowed as well,
+ * but there is no need to support independent rows and
* allowing them makes for semantic difficulties.
- *
+ *
* @var string|array A string or array of string values of the allowed element tags.
*/
protected $_allowedChildTags = array(self::CAPTION, self::COLGROUPS, self::TBODY, self::TFOOT, self::THEAD);
@@ -113,29 +113,29 @@
/**
* All content is added to the tbody element.
- *
+ *
* @var string The tagname of the element that should be created for content not having an $_allowedChildTags.
*/
protected $_defaultChildTag = 'tbody';
/**
* Signals the default row class was set
- *
- * @var boolean
+ *
+ * @var boolean
*/
protected $_defaultRowClassSet = false;
/**
* When set the table layout is pivoted to the left when rendering.
- *
+ *
* I.e. the first (header) row becomes the first column, etc..
- *
+ *
* When set this is an array containing array(self::THEAD => number_of_header_rows, self::TFOOT => number_of_footer_rows).
- *
+ *
* @var array False or array containing number of header en footer rows
*/
protected $_pivot = false;
-
+
/**
* Always start on a new line. Makes the html code better readable
*
@@ -150,9 +150,9 @@
/**
* When empty a table element should not be output at rendering time as
* a stand-alone <table/> tag makes no sense.
- *
+ *
* @see $_repeater
- *
+ *
* @var boolean The element is rendered even without content when true.
*/
public $renderWithoutContent = false;
@@ -191,7 +191,7 @@
/**
* Makes sure the column width of the $name part is equal to that
* of the 'tbody' part.
- *
+ *
* @param string $name 'thead' or 'tfoot'
*/
private function _equalizeColumnCounts($name)
@@ -204,18 +204,18 @@
}
}
- private function _pivotBody($name)
+ private function _pivotBody($name)
{
$newBody = MUtil_Html::create($name);
-
+
if ($this->_content[$name] instanceof MUtil_Html_TBodyElement) {
$newBody->_attribs = $this->_content[$name]->_attribs;
$newBody->defaultRowClass = $this->_content[$name]->getDefaultRowClass();
}
-
+
return $newBody;
}
-
+
private function _pivotContent($headerRows, $footerRows)
{
$newContent[self::CAPTION] = $this->_content[self::CAPTION];
@@ -226,14 +226,14 @@
$order = array($this->_content[self::THEAD], $this->_content[self::TBODY], $this->_content[self::TFOOT]);
$newRows = array();
-
+
foreach ($order as $oldBody) {
-
+
if ($oldBody) {
foreach ($oldBody as $row) {
$bodyRepeater = $oldBody->getRepeater();
-
+
$i = 0;
foreach ($row as $cell) {
if (! isset($newRows[$i])) {
@@ -267,10 +267,10 @@
}
}
}
-
+
$rowCount = count($newRows);
$footerStart = $rowCount - $footerRows;
-
+
for ($i = 0; $i < $headerRows; $i++) {
$newRows[$i]->appendAttrib('class', $newContent[self::THEAD]->getDefaultRowClass());
$newContent[self::THEAD][] = $newRows[$i];
@@ -283,7 +283,7 @@
$newRows[$i]->appendAttrib('class', $newContent[self::TFOOT]->getDefaultRowClass());
$newContent[self::TFOOT][] = $newRows[$i];
}
-
+
return $newContent;
}
@@ -572,7 +572,7 @@
/**
* Returns the cell or a MUtil_MultiWrapper containing cells that occupy the column position, taking colspan and other functions into account.
- *
+ *
* @param int $col The numeric column position, starting at 0;
* @return MUtil_Html_HtmlElement Probably an element of this type, but can also be something else, posing as an element.
*/
@@ -581,16 +581,16 @@
$count = -1;
foreach ($this->_content as $cell) {
$count += self::getCellWidth($cell);
-
+
if ($count >= $col) {
return $cell;
}
}
}
-
+
/**
* Returns the cells that occupies the column position, taking colspan and other functions into account, in an array.
- *
+ *
* @param int $col The numeric column position, starting at 0;
* @return array Of probably one MUtil_Html_HtmlElement
*/
@@ -606,10 +606,10 @@
return $results;
}
-
+
/**
* Return the number of columns, taking such niceties as colspan into account
- *
+ *
* @return int
*/
public function getColumnCount()
@@ -647,7 +647,7 @@
/**
* Renders the element tag with it's content into a html string
- *
+ *
* The $view is used to correctly encode and escape the output
*
* @param Zend_View_Abstract $view
@@ -657,22 +657,22 @@
{
if ($this->_pivot) {
$oldContent = $this->_content;
-
+
$this->_repeater = $this->getRepeater(); // Cache for bridge
$this->_content = $this->_pivotContent($this->_pivot[self::THEAD], $this->_pivot[self::TFOOT]);
-
+
$html = parent::render($view);
-
+
$this->_repeater = null;
$this->_content = $oldContent;
-
+
return $html;
-
+
} else {
return parent::render($view);
}
}
-
+
/**
* Support function for renderVar(). Use of renderVar is preferred.
*
@@ -714,7 +714,7 @@
{
return self::createVar($data, $caption)->render($view);
}
-
+
public function setAlternateRowClass($class1 = 'odd', $class2 = 'even')
{
$args = func_get_args();
@@ -760,17 +760,17 @@
$decorator->setHtmlElement($this);
$decorator->setPrologue($formrep); // Renders hidden elements before this element
$form->setDecorators(array($decorator, 'AutoFocus', 'Form'));
-
+
return $this;
}
/**
* Set the default row class of the tbody item (as the table has rows)
- *
+ *
* When a new row is added to the body it is autmatically given the
* class attribute specified here.
*
- * @param string $tag Tagname
+ * @param string $tag Tagname
* @return MUtil_Html_TableElement (continuation pattern)
*/
public function setDefaultRowClass($class)
@@ -783,13 +783,13 @@
/**
* Setting a table to pviot left-rotates the table at rendering time.
- *
+ *
* The header rows become the first columns, the body rows form the next
* set of columns and lastly the footer rows become the rightmost columns.
- *
+ *
* In other words: this humble setting switches a table with repeating rows
* in a table with repeating columns.
- *
+ *
* @param boolean $pivot True to switch to left rotated pivot when rendering
* @param int $headerRows The number of pivoted rows going to in the header
* @param int $footerRows The number of pivoted rows going to in the footer
@@ -807,11 +807,11 @@
/**
* Set the content displayed by the tbody item when it is empty during rendering.
- *
+ *
* Overruled as the onEmpty is not set on this element itself.
- *
+ *
* @see $_onEmptyContent;
- *
+ *
* @param mixed $content Content that can be rendered.
* @return MUtil_Html_TableElement (continuation pattern)
*/
@@ -820,17 +820,17 @@
$this->_content[self::TBODY]->setOnEmpty($content, $this);
return $this;
}
-
+
/**
* Overruled as setting a table repeater means repeating the content of the tbody element.
* Not repeating thead, tfoot and tbody elements but just repeating the rows in the tbody element.
- *
- * Repeat the element when rendering.
- *
- * When repeatTags is false (the default) only the content is repeated but
+ *
+ * Repeat the element when rendering.
+ *
+ * When repeatTags is false (the default) only the content is repeated but
* not the element tags. When repeatTags is true the both the tags and the
* content are repeated.
- *
+ *
* @param mixed $repeater MUtil_Lazy_RepeatableInterface or something that can be made into one.
* @param mixed $onEmptyContent Optional. When not null the content to display when the repeater does not result in data is set.
* @param boolean $repeatTags Optional when not null the repeatTags switch is set.
@@ -841,12 +841,12 @@
$this->_content[self::TBODY]->setRepeater($repeater, $onEmptyContent, $repeatTags, $this);
return $this;
}
-
+
/**
* Static helper function for creation, used by @see MUtil_Html_Creator.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
- * @return MUtil_Html_TableElement
+ * @return MUtil_Html_TableElement
*/
public static function table($arg_array = null)
{
@@ -855,10 +855,10 @@
}
/**
- * Returns the tbody element.
- *
+ * Returns the tbody element.
+ *
* Addition of multiple bodies is not possible.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_TBodyElement With 'tbody' tagName
*/
@@ -875,7 +875,7 @@
/**
* Returns a 'td' cell in the current row in the tbody
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'td' tagName
*/
@@ -887,7 +887,7 @@
/**
* Returns a 'th' cell in the current row in the tbody
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'th' tagName
*/
@@ -899,7 +899,7 @@
/**
* Returns a 'td' cell in a new row in the body with a colspan equal to the number of columns in the table.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'td' tagName
*/
@@ -916,7 +916,7 @@
/**
* Returns a 'td' cell in the current row in the footer
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'td' tagName
*/
@@ -928,7 +928,7 @@
/**
* Returns a 'th' cell in the current row in the footer
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'th' tagName
*/
@@ -940,9 +940,9 @@
/**
* Returns the tfoot element. Creates when needed.
- *
+ *
* Addition of multiple bodies is not possible.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_TBodyElement With 'tfoot' tagName
*/
@@ -962,7 +962,7 @@
/**
* Returns a 'td' cell in a new row in the footer with a colspan equal to the number of columns in the table.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'td' tagName
*/
@@ -979,7 +979,7 @@
/**
* Returns a 'th' cell in the current row in the header
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'th' tagName
*/
@@ -991,9 +991,9 @@
/**
* Returns the thead element. Creates when needed.
- *
+ *
* Addition of multiple bodies is not possible.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_TBodyElement With 'thead' tagName
*/
@@ -1013,7 +1013,7 @@
/**
* Returns a 'td' cell in the current row in the header
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'td' tagName
*/
@@ -1025,7 +1025,7 @@
/**
* Returns a 'td' cell in a new row in the header with a colspan equal to the number of columns in the table.
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'td' tagName
*/
@@ -1037,11 +1037,11 @@
/**
* Returns a 'th' cell in a new row in the header with a colspan equal to the number of columns in the table.
- *
+ *
* The name should be 'throw', but that is not an allowed function, so we redefined it as an alias in __call
- *
+ *
* @see __call
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_HtmlElement With 'th' tagName
*/
@@ -1060,12 +1060,12 @@
/**
* Returns a new row in the tbody.
- *
+ *
* Also signals thead and tfoot that we are on a new row for addColumn() addition.
- *
+ *
* @see addColumn
* @see addColumnArray
- *
+ *
* @param mixed $arg_array Optional MUtil_Ra::args processed settings
* @return MUtil_Html_TrElement
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-19 16:29:30
|
Revision: 40
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=40&view=rev
Author: matijsdejong
Date: 2011-09-19 16:29:20 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Started on #9 MailLog activity overview en #10 replacement for BrowseEditAction
The results works for browsing, but misses a data cache as in BrowseEdit
Updated the Marker object to allow changes later in the execution of the program
Modified Paths:
--------------
trunk/library/classes/Gems/Menu/MenuAbstract.php
trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php
trunk/library/classes/MUtil/Html/Marker.php
trunk/library/classes/MUtil/Html/PagePanel.php
trunk/library/classes/MUtil/Snippets/ModelSnippetAbstract.php
trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php
trunk/library/classes/MUtil/Snippets/SnippetAbstract.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Added Paths:
-----------
trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
trunk/library/classes/Gems/Default/MailLogAction.php
trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
trunk/library/controllers/MailLogController.php
trunk/library/snippets/Generic/
trunk/library/snippets/Generic/AutosearchForm.php
trunk/library/snippets/Generic/ModelTableSnippet.php
Added: trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php (rev 0)
+++ trunk/library/classes/Gems/Controller/ModelSnippetActionAbstract.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Short description of file
+ *
+ * @package Gems
+ * @subpackage Controller
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 203 2011-07-07 12:51:32Z matijs $
+ */
+
+/**
+ * Short description for class
+ *
+ * Long description for class (if any)...
+ *
+ * @package Gems
+ * @subpackage Controller
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4.2
+ */
+abstract class Gems_Controller_ModelSnippetActionAbstract extends MUtil_Controller_ModelSnippetActionAbstract
+{
+ /**
+ *
+ * @var GemsEscort
+ */
+ public $escort;
+
+ /**
+ * The parameters used for the autofilter action.
+ *
+ * @var array Mixed key => value array for snippet initialization
+ */
+ protected $autofilterParameters = array(
+ 'browse' => true,
+ 'containingId' => 'autofilter_target',
+ 'keyboard' => true,
+ );
+
+ /**
+ * The snippets used for the autofilter action.
+ *
+ * @var mixed String or array of snippets name
+ */
+ protected $autofilterSnippets = 'Generic_ModelTableSnippet';
+
+ /**
+ * The snippets used for the index action, minus those in autofilter
+ *
+ * @var mixed String or array of snippets name
+ */
+ protected $indexSnippets = 'Generic_AutosearchForm';
+
+ /**
+ * Intializes the html component.
+ *
+ * @param boolean $reset Throws away any existing html output when true
+ * @return void
+ */
+ public function initHtml($reset = false)
+ {
+ if (! $this->html) {
+ Gems_Html::init();
+ }
+
+ parent::initHtml($reset);
+ }
+}
Added: trunk/library/classes/Gems/Default/MailLogAction.php
===================================================================
--- trunk/library/classes/Gems/Default/MailLogAction.php (rev 0)
+++ trunk/library/classes/Gems/Default/MailLogAction.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Short description of file
+ *
+ * @package Gems
+ * @subpackage Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 203 2011-07-07 12:51:32Z matijs $
+ */
+
+/**
+ * Short description for class
+ *
+ * Long description for class (if any)...
+ *
+ * @package Gems
+ * @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4
+ */
+class Gems_Default_MailLogAction extends Gems_Controller_ModelSnippetActionAbstract
+{
+ /**
+ * Creates a model for getModel(). Called only for each new $action.
+ *
+ * The parameters allow you to easily adapt the model to the current action. The $detailed
+ * parameter was added, because the most common use of action is a split between detailed
+ * and summarized actions.
+ *
+ * @param boolean $detailed True when the current action is not in $summarizedActions.
+ * @param string $action The current action.
+ * @return MUtil_Model_ModelAbstract
+ */
+ public function createModel($detailed, $action)
+ {
+ $model = new MUtil_Model_TableModel('gems__respondent_communications');
+
+ // $model->set('grco_id_to', 'label', $this->_(''));
+ // $model->set('grco_id_by', 'label', $this->_(''));
+ $model->set('grco_address', 'label', $this->_('To'));
+ $model->set('grco_sender', 'label', $this->_('From'));
+ $model->set('grco_topic', 'label', $this->_('Subject'));
+ $model->set('grco_created', 'label', $this->_('Date sent'));
+ // $model->set('', 'label', $this->_(''));
+
+ return $model;
+ }
+
+ public function indexAction()
+ {
+ $this->html->h3($this->_('Mail Activity Log'));
+
+ $filter = array('grco_organization' => $this->escort->getCurrentOrganization());
+
+ $this->indexParameters['extraFilter'] = $filter;
+ $this->indexParameters['extraSort'] = array('grco_created' => SORT_DESC);
+
+ parent::indexAction();
+ }
+}
Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -202,6 +202,9 @@
{
$setup = $this->addContainer($label);
+ // MAIL ACTIVITY CONTROLLER
+ $setup->addBrowsePage($this->_('Activity'), 'pr.mail.log', 'mail-log');
+
// MAIL Server CONTROLLER
$page = $setup->addBrowsePage($this->_('Servers'), 'pr.mail.server', 'mail-server');
// $page->addAction($this->_('Test'), 'pr.mail.server.test', 'test')->addParameters(MUtil_Model::REQUEST_ID);
Modified: trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php
===================================================================
--- trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/classes/Gems/Snippets/ModelTableSnippetAbstract.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -3,7 +3,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,8 +25,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
+ *
+ *
* @package Gems
* @subpackage Snippets
* @author Matijs de Jong <mj...@ma...>
@@ -37,10 +37,10 @@
/**
* Adds Gems specific display details and helper functions:
- *
+ *
* Items set are:
* - Display class: 'browser'
- *
+ *
* Extra helpers are:
* - Baseurl helper: $this->requestCache
* - Keyboard access: $this->keyboard & getHtmlOutput()
@@ -63,6 +63,12 @@
protected $class = 'browser';
/**
+ *
+ * @var string The id of a div that contains the table.
+ */
+ protected $containingId;
+
+ /**
* Use keyboard to select row
*
* @var boolean
@@ -96,6 +102,19 @@
protected $sortParamDesc = 'dsrt';
/**
+ * Add the paginator panel to the table.
+ *
+ * Only called when $this->browse is true. Overrule this function
+ * to define your own method.
+ *
+ * $param Zend_Paginator $paginator
+ */
+ protected function addPaginator(MUtil_Html_TableElement $table, Zend_Paginator $paginator)
+ {
+ $table->tfrow()->pagePanel($paginator, $this->request, $this->translate, array('baseUrl' => $this->baseUrl));
+ }
+
+ /**
* Should be called after answering the request to allow the Target
* to check if all required registry values have been set correctly.
*
@@ -153,12 +172,16 @@
$table = parent::getHtmlOutput($view);
$table->getOnEmpty()->class = 'centerAlign';
- if ($this->keyboard) {
+ if ($this->containingId || $this->keyboard) {
$this->applyHtmlAttributes($table);
- $div = MUtil_Html::create()->div(array('id' => 'keys_target'), $table);
+ $div = MUtil_Html::create()->div(array('id' => $this->containingId ? $this->containingId : 'keys_target'), $table);
- return array($div, new Gems_JQuery_TableRowKeySelector($div));
+ if ($this->keyboard) {
+ return array($div, new Gems_JQuery_TableRowKeySelector($div));
+ } else {
+ return $div;
+ }
} else {
return $table;
}
Added: trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php (rev 0)
+++ trunk/library/classes/MUtil/Controller/ModelSnippetActionAbstract.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * @package MUtil
+ * @subpackage Controller
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: Sample.php 203 2011-07-07 12:51:32Z matijs $
+ */
+
+/**
+ * Controller class with standard model and snippet based browse (index), IN THE NEAR FUTURE show, edit and delete actions.
+ *
+ * To change the behaviour of this class the prime method is changing the snippets used for an action.
+ *
+ * @package MUtil
+ * @subpackage Controller
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4.2
+ */
+abstract class MUtil_Controller_ModelSnippetActionAbstract extends MUtil_Controller_ModelActionAbstract
+{
+ /**
+ * The parameters used for the autofilter action.
+ *
+ * @var array Mixed key => value array for snippet initialization
+ */
+ protected $autofilterParameters = array();
+
+ /**
+ * The snippets used for the autofilter action.
+ *
+ * @var mixed String or array of snippets name
+ */
+ protected $autofilterSnippets = 'ModelTableSnippet';
+
+ /**
+ * The parameters used for the index action minus those in autofilter.
+ *
+ * @var array Mixed key => value array for snippet initialization
+ */
+ protected $indexParameters = array();
+
+ /**
+ * The snippets used for the index action, minus those in autofilter
+ *
+ * @var mixed String or array of snippets name
+ */
+ protected $indexSnippets = null;
+
+ /**
+ * Set the action key in request
+ *
+ * Use this when an action is a Ajax action for retrieving
+ * information for use within the screen of another action
+ *
+ * @param string $alias
+ */
+ protected function aliasAction($alias)
+ {
+ $request = $this->getRequest();
+ $request->setActionName($alias);
+ $request->setParam($request->getActionKey(), $alias);
+ }
+
+ /**
+ * The automatically filtered result
+ */
+ public function autofilterAction($resetMvc = true)
+ {
+ // MUtil_Model::$verbose = true;
+
+ // We do not need to return the layout, just the above table
+ if ($resetMvc) {
+ // Make sure all links are generated as if the current request was index.
+ $this->aliasAction('index');
+
+ Zend_Layout::resetMvcInstance();
+ }
+
+ if ($this->autofilterSnippets) {
+ $this->autofilterParameters['model'] = $this->getModel();
+ $this->autofilterParameters['request'] = $this->getRequest();
+
+ $this->addSnippets($this->autofilterSnippets, $this->autofilterParameters);
+ }
+ }
+
+ /**
+ * Action for showing a browse page, optional with
+ */
+ public function indexAction()
+ {
+ if ($this->indexSnippets) {
+ $this->indexParameters = $this->indexParameters + $this->autofilterParameters;
+
+ $this->indexParameters['model'] = $this->getModel();
+ $this->indexParameters['request'] = $this->getRequest();
+
+ $this->addSnippets($this->indexSnippets, $this->indexParameters);
+ }
+
+ $this->autofilterAction(false);
+ }
+
+}
Modified: trunk/library/classes/MUtil/Html/Marker.php
===================================================================
--- trunk/library/classes/MUtil/Html/Marker.php 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/classes/MUtil/Html/Marker.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -1,33 +1,33 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @version $Id$
+ *
+ * @version $Id$
* @package MUtil
* @subpackage Html
* @copyright Copyright (c) 2011 Erasmus MC
@@ -39,7 +39,7 @@
* @subpackage Html
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- */
+ */
class MUtil_Html_Marker
{
const TAG_MARKER = "\0";
@@ -52,23 +52,14 @@
public function __construct($searches, $tag, $encoding, $attributes = 'class="marked"')
{
- $this->_encoding = $encoding;
+ $this->setEncoding($encoding);
$this->_tag = $tag;
if ($attributes) {
$this->_attributes = ' ' . trim($attributes) . ' ';
}
- // Do not use the $tag itself here: str_replace will then replace
- // the text of tag itself on later finds
- $topen = '<' . self::TAG_MARKER . '>';
- $tclose = '</' . self::TAG_MARKER . '>';
-
- foreach ((array) $searches as $search) {
- $searchHtml = $this->escape($search);
- $this->_searches[] = $searchHtml;
- $this->_replaces[] = $topen . $searchHtml . $tclose;
- }
+ $this->_searches = (array) $searches;
}
private function _fillTags($text)
@@ -91,6 +82,23 @@
public function mark($value)
{
+ if (! $this->_replaces) {
+ // Late setting of search & replaces
+ $searches = $this->_searches;
+ $this->_searches = array();
+
+ // Do not use the $tag itself here: str_replace will then replace
+ // the text of tag itself on later finds
+ $topen = '<' . self::TAG_MARKER . '>';
+ $tclose = '</' . self::TAG_MARKER . '>';
+
+ foreach ((array) $searches as $search) {
+ $searchHtml = $this->escape($search);
+ $this->_searches[] = $searchHtml;
+ $this->_replaces[] = $topen . $searchHtml . $tclose;
+ }
+ }
+
if ($value instanceof MUtil_Html_Raw) {
$values = array();
// Split into HTML Elements
@@ -128,5 +136,33 @@
return new MUtil_Html_Raw($this->_fillTags($valueTemp));
}
}
+
+ /**
+ * Function to allow later setting of encoding.
+ *
+ * @see htmlspecialchars()
+ *
+ * @param string $encoding Encoding htmlspecialchars
+ * @return MUtil_Html_Marker (continuation pattern)
+ */
+ public function setEncoding($encoding)
+ {
+ $this->_encoding = $encoding;
+
+ return $this;
+ }
+
+ /**
+ * Function to allow later setting of tag name.
+ *
+ * @param string $tagName Html element tag name
+ * @return MUtil_Html_Marker (continuation pattern)
+ */
+ public function setTagName($tagName)
+ {
+ $this->_tag = $tagName;
+
+ return $this;
+ }
}
Modified: trunk/library/classes/MUtil/Html/PagePanel.php
===================================================================
--- trunk/library/classes/MUtil/Html/PagePanel.php 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/classes/MUtil/Html/PagePanel.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -1,33 +1,33 @@
<?php
-
-/**
- * Copyright (c) 2011, Erasmus MC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Erasmus MC nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
class MUtil_Html_PagePanel extends MUtil_Html_Sequence implements MUtil_Lazy_Procrastinator
{
protected $_baseUrl = array();
@@ -401,9 +401,9 @@
return new MUtil_Html_PageRangeRenderer($this, $args);
}
- public function setBaseUrl(array $baseUrl)
+ public function setBaseUrl(array $baseUrl = null)
{
- $this->_baseUrl = $baseUrl;
+ $this->_baseUrl = (array) $baseUrl;
return $this;
}
Modified: trunk/library/classes/MUtil/Snippets/ModelSnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/ModelSnippetAbstract.php 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/classes/MUtil/Snippets/ModelSnippetAbstract.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -3,7 +3,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,8 +25,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
+ *
+ *
* @package MUtil
* @subpackage Snippets
* @author Matijs de Jong <mj...@ma...>
@@ -55,7 +55,7 @@
* Set a fixed model filter.
*
* Leading _ means not overwritten by sources.
- *
+ *
* @var array
*/
protected $_fixedFilter;
@@ -77,7 +77,28 @@
private $_model;
/**
+ * Optional extra filter
*
+ * @var array
+ */
+ public $extraFilter;
+
+ /**
+ * Optional extra sort(s)
+ *
+ * @var array
+ */
+ public $extraSort;
+
+ /**
+ * When true the post parameters are removed from the request while filtering
+ *
+ * @var boolean Should post variables be removed from the request?
+ */
+ public $removePost = true;
+
+ /**
+ *
* @var Zend_Controller_Request_Abstract
*/
protected $request;
@@ -154,9 +175,15 @@
if ($this->_fixedFilter) {
$model->addFilter($this->_fixedFilter);
}
+ if ($this->extraFilter) {
+ $model->addFilter($this->extraFilter);
+ }
if ($this->_fixedSort) {
$model->addSort($this->_fixedSort);
}
+ if ($this->extraSort) {
+ $model->addSort($this->extraSort);
+ }
}
/**
@@ -165,15 +192,15 @@
* @param MUtil_Model_ModelAbstract $model
*/
protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
- {
+ {
if ($this->request) {
- $model->applyRequest($this->request);
+ $model->applyRequest($this->request, $this->removePost);
}
}
/**
- * Use this when overruling processFilterAndSort()
- *
+ * Use this when overruling processFilterAndSort()
+ *
* Overrule to implement snippet specific filtering and sorting.
*
* @param MUtil_Model_ModelAbstract $model
Modified: trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/classes/MUtil/Snippets/ModelTableSnippetAbstract.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -3,7 +3,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,8 +25,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
+ *
+ *
* @package MUtil
* @subpackage Snippets
* @author Matijs de Jong <mj...@ma...>
@@ -36,12 +36,12 @@
*/
/**
- * Displays multiple items in a model below each other in an Html table.
- *
+ * Displays multiple items in a model below each other in an Html table.
+ *
* To use this class either subclass or use the existing default ModelTableSnippet.
*
* @see ModelTableSnippet
- *
+ *
* @package MUtil
* @subpackage Snippets
* @copyright Copyright (c) 2011 Erasmus MC
@@ -51,12 +51,18 @@
abstract class MUtil_Snippets_ModelTableSnippetAbstract extends MUtil_Snippets_ModelSnippetAbstract
{
/**
+ *
+ * @var MUtil_Html_Marker Class for marking text in the output
+ */
+ protected $_marker;
+
+ /**
* Url parts added to each link in the resulting table
- *
+ *
* @var array
*/
public $baseUrl;
-
+
/**
* Sets pagination on or off.
*
@@ -65,6 +71,13 @@
public $browse = false;
/**
+ * When true the post parameters are removed from the request while filtering
+ *
+ * @var boolean Should post variables be removed from the request?
+ */
+ public $removePost = false;
+
+ /**
* Content to show when there are no rows.
*
* Null shows '…'
@@ -93,6 +106,20 @@
}
/**
+ * Add the paginator panel to the table.
+ *
+ * Only called when $this->browse is true. Overrule this function
+ * to define your own method.
+ *
+ * @param MUtil_Html_TableElement $table
+ * $param Zend_Paginator $paginator
+ */
+ protected function addPaginator(MUtil_Html_TableElement $table, Zend_Paginator $paginator)
+ {
+ $table->tfrow()->pagePanel($paginator, $this->request, array('baseUrl' => $this->baseUrl));
+ }
+
+ /**
* Creates from the model a MUtil_Html_TableElement that can display multiple items.
*
* Allows overruling
@@ -116,7 +143,7 @@
return $bridge->getTable();
}
-
+
/**
* Create the snippets content
*
@@ -135,11 +162,51 @@
if ($this->browse) {
$paginator = $model->loadPaginator();
$table->setRepeater($paginator);
- $table->tfrow()->pagePanel($paginator, $this->request, array('baseUrl' => $this->baseUrl));
+ $this->addPaginator($table, $paginator);
} else {
$table->setRepeater($model->loadRepeatable());
}
return $table;
}
+
+ /**
+ * Overrule to implement snippet specific filtering and sorting.
+ *
+ * @param MUtil_Model_ModelAbstract $model
+ */
+ protected function processFilterAndSort(MUtil_Model_ModelAbstract $model)
+ {
+ parent::processFilterAndSort($model);
+
+ // Add generic text search filter and marker
+ $textKey = $model->getTextFilter();
+ if ($searchText = $this->request->getParam($textKey)) {
+ // MUtil_Echo::r($textKey . '[' . $searchText . ']');
+ $this->_marker = new MUtil_Html_Marker($model->getTextSearches($searchText), 'strong', 'xxUTF-8');
+
+ foreach ($model->getItemNames() as $name) {
+ if ($model->get($name, 'label')) {
+ $model->set($name, 'markCallback', array($this->_marker, 'mark'));
+ }
+ }
+ }
+ }
+
+ /**
+ * Render a string that becomes part of the HtmlOutput of the view
+ *
+ * You should override either getHtmlOutput() or this function to generate output
+ *
+ * @param Zend_View_Abstract $view
+ * @return string Html output
+ */
+ public function render(Zend_View_Abstract $view)
+ {
+ if ($this->_marker) {
+ $this->_marker->setEncoding($view->getEncoding());
+ }
+
+ return parent::render($view);
+ }
}
Modified: trunk/library/classes/MUtil/Snippets/SnippetAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Snippets/SnippetAbstract.php 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/classes/MUtil/Snippets/SnippetAbstract.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -3,7 +3,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -14,7 +14,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,8 +25,8 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
+ *
+ *
* @package MUtil
* @subpackage Snippets
* @author Matijs de Jong <mj...@ma...>
@@ -36,7 +36,7 @@
*/
/**
- * An abstract class for building snippets. Sub classes should override at leist
+ * An abstract class for building snippets. Sub classes should override at least
* getHtmlOutput(0 or render() to generate output.
*
* This class add's to the interface helper variables and functions for:
@@ -59,7 +59,7 @@
* @var Zend_Controller_Action_Helper_FlashMessenger
*/
private $_messenger;
-
+
/**
* Attributes (e.g. class) for the main html element
*
@@ -77,11 +77,11 @@
/**
* Variable to either keep or throw away the request data
* not specified in the route.
- *
+ *
* @var boolean True then the route is reset
*/
public $resetRoute = false;
-
+
/**
* Set as this is a MUtil_Registry_TargetInterface
*
@@ -124,9 +124,9 @@
}
/**
- * Applies the $this=>attributes and $this->class snippet parameters to the
+ * Applies the $this=>attributes and $this->class snippet parameters to the
* $html element.
- *
+ *
* @param MUtil_Html_HtmlElement $html Element to apply the snippet parameters to.
*/
protected function applyHtmlAttributes(MUtil_Html_HtmlElement $html)
@@ -168,7 +168,7 @@
/**
* Retrieves the messenger
- *
+ *
* @return Zend_Controller_Action_Helper_FlashMessenger
*/
protected function getMessenger()
@@ -181,22 +181,22 @@
/**
* When hasHtmlOutput() is false a snippet code user should check
- * for a redirectRoute. Otherwise the redirect calling render() will
+ * for a redirectRoute. Otherwise the redirect calling render() will
* execute the redirect.
- *
+ *
* This function should never return a value when the snippet does
* not redirect.
- *
- * Also when hasHtmlOutput() is true this function should not be
+ *
+ * Also when hasHtmlOutput() is true this function should not be
* called.
- *
+ *
* @see Zend_Controller_Action_Helper_Redirector
- *
+ *
* @return mixed Nothing or either an array or a string that is acceptable for Redector->gotoRoute()
*/
public function getRedirectRoute()
{ }
-
+
/**
* The place to check if the data set in the snippet is valid
* to generate the snippet.
@@ -235,9 +235,9 @@
/**
* When there is a redirectRoute this function will execute it.
- *
+ *
* When hasHtmlOutput() is true this functions should not be called.
- *
+ *
* @see Zend_Controller_Action_Helper_Redirector
*/
public function redirectRoute()
@@ -247,7 +247,7 @@
$router->gotoRouteAndExit($url, null, $this->resetRoute);
}
}
-
+
/**
* Render a string that becomes part of the HtmlOutput of the view
*
@@ -260,7 +260,7 @@
{
if ($this->getRedirectRoute()) {
$this->redirectRoute();
-
+
} else {
$html = $this->getHtmlOutput($view);
Copied: trunk/library/controllers/MailLogController.php (from rev 34, trunk/library/controllers/MailServerController.php)
===================================================================
--- trunk/library/controllers/MailLogController.php (rev 0)
+++ trunk/library/controllers/MailLogController.php 2011-09-19 16:29:20 UTC (rev 40)
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Copyright (c) 2011, Erasmus MC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Erasmus MC nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package Gems
+ * @subpackage Default
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id$
+ */
+
+/**
+ *
+ * @package Gems
+ * @subpackage Default
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.4.2
+ */
+class MailLogController extends Gems_Default_MailLogAction
+{
+}
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/languages/default-en.po 2011-09-19 16:29:20 UTC (rev 40)
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: Pulse EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-19 10:05+0100\n"
+"POT-Creation-Date: 2011-09-19 18:18+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Menno Dekker <men...@er...>\n"
+"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -473,56 +473,56 @@
msgid "No %s found"
msgstr "No %s found"
-#: classes/Gems/Controller/BrowseEditAction.php:634
+#: classes/Gems/Controller/BrowseEditAction.php:635
#, php-format
msgid "No %s found."
msgstr "No %s found."
-#: classes/Gems/Controller/BrowseEditAction.php:749
+#: classes/Gems/Controller/BrowseEditAction.php:750
msgid "Are you sure?"
msgstr "Are you sure?"
-#: classes/Gems/Controller/BrowseEditAction.php:765
+#: classes/Gems/Controller/BrowseEditAction.php:766
msgid "Yes"
msgstr "Yes"
-#: classes/Gems/Controller/BrowseEditAction.php:766
+#: classes/Gems/Controller/BrowseEditAction.php:767
msgid "No"
msgstr "No"
-#: classes/Gems/Controller/BrowseEditAction.php:819
+#: classes/Gems/Controller/BrowseEditAction.php:820
#, php-format
msgid "Unknown %s requested"
msgstr "Unknown %s requested"
-#: classes/Gems/Controller/BrowseEditAction.php:842
+#: classes/Gems/Controller/BrowseEditAction.php:843
#, php-format
msgid "New %1$s..."
msgstr "New %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:850
+#: classes/Gems/Controller/BrowseEditAction.php:851
msgid "Save"
msgstr "Save"
-#: classes/Gems/Controller/BrowseEditAction.php:886
+#: classes/Gems/Controller/BrowseEditAction.php:887
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s saved"
-#: classes/Gems/Controller/BrowseEditAction.php:889
+#: classes/Gems/Controller/BrowseEditAction.php:890
msgid "No changes to save."
msgstr "No changes to save."
-#: classes/Gems/Controller/BrowseEditAction.php:898
+#: classes/Gems/Controller/BrowseEditAction.php:899
msgid "Input error! No changes saved!"
msgstr "Input error! No changes saved!"
-#: classes/Gems/Controller/BrowseEditAction.php:926
+#: classes/Gems/Controller/BrowseEditAction.php:927
#, php-format
msgid "Show %s"
msgstr "Show %s"
-#: classes/Gems/Controller/BrowseEditAction.php:933
+#: classes/Gems/Controller/BrowseEditAction.php:934
#, php-format
msgid "Unknown %s."
msgstr "Unknown %s."
@@ -629,10 +629,13 @@
msgstr "The number zero and the letter O are treated as the same; the same goes for the number one and the letter L."
#: classes/Gems/Default/ConsentAction.php:66
+#: classes/Gems/Default/CountryAction.php:67
+#: classes/Gems/Default/GroupAction.php:87
msgid "Description"
msgstr "Description"
#: classes/Gems/Default/ConsentAction.php:68
+#: classes/Gems/Default/DatabaseAction.php:155
msgid "Order"
msgstr "Order"
@@ -751,7 +754,6 @@
msgstr "Group"
#: classes/Gems/Default/DatabaseAction.php:156
-#: classes/Gems/Default/OrganizationAction.php:116
msgid "Location"
msgstr "Location"
@@ -1043,7 +1045,6 @@
msgstr "Role"
#: classes/Gems/Default/GroupAction.php:91
-#: classes/Gems/Default/OrganizationAction.php:132
msgid "Active"
msgstr "Active"
@@ -1224,6 +1225,7 @@
msgstr "Log maintenance"
#: classes/Gems/Default/MailAction.php:61
+#: classes/Gems/Default/MailLogAction.php:71
msgid "Subject"
msgstr "Subject"
@@ -1241,6 +1243,22 @@
msgid "Email templates"
msgstr "Email templates"
+#: classes/Gems/Default/MailLogAction.php:69
+msgid "To"
+msgstr "To"
+
+#: classes/Gems/Default/MailLogAction.php:70
+msgid "From"
+msgstr "From"
+
+#: classes/Gems/Default/MailLogAction.php:72
+msgid "Date sent"
+msgstr "Date sent"
+
+#: classes/Gems/Default/MailLogAction.php:80
+msgid "Mail Activity Log"
+msgstr "Mail Activity Log"
+
#: classes/Gems/Default/MailServerAction.php:68
msgid "From address [part]"
msgstr "From address [part]"
@@ -1282,8 +1300,6 @@
msgstr "User ID"
#: classes/Gems/Default/MailServerAction.php:90
-#: classes/Gems/Default/OptionAction.php:107
-#: classes/Gems/Default/OptionAction.php:112
msgid "Repeat password"
msgstr "Repeat password"
@@ -1303,10 +1319,13 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
+#: classes/Gems/Default/RespondentAction.php:164
+#: classes/Gems/Default/StaffAction.php:192
msgid "Language"
msgstr "Language"
#: classes/Gems/Default/OptionAction.php:74
+#: classes/Gems/Default/StaffAction.php:193
msgid "Logout on survey"
msgstr "Logout on survey"
@@ -1371,6 +1390,7 @@
msgstr "Invalid organization."
#: classes/Gems/Default/OrganizationAction.php:117
+#: classes/Gems/Default/SourceAction.php:143
msgid "Url"
msgstr "Url"
@@ -1533,13 +1553,6 @@
msgid "By"
msgstr "By"
-#: classes/Gems/Default/ProjectSurveysAction.php:69
-#: classes/Gems/Default/ProjectTracksAction.php:67
-#: classes/Gems/Default/SurveyAction.php:193
-#: classes/Gems/Default/TrackAction.php:329
-msgid "From"
-msgstr "From"
-
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
#: classes/Gems/Default/SurveyAction.php:195
@@ -1583,7 +1596,6 @@
msgstr "Survey not specified."
#: classes/Gems/Default/ProjectTracksAction.php:120
-#: classes/Gems/Default/TrackActionAbstract.php:479
#, php-format
msgid "Track %s does not exist."
msgstr "Track %s does not exist."
@@ -2282,10 +2294,12 @@
msgstr "Free text"
#: classes/Gems/Default/TrackFieldsAction.php:114
+#: classes/Gems/Default/TrackMaintenanceAction.php:211
msgid "Values"
msgstr "Values"
#: classes/Gems/Default/TrackFieldsAction.php:116
+#: classes/Gems/Default/TrackMaintenanceAction.php:213
msgid "Required"
msgstr "Required"
@@ -2431,11 +2445,6 @@
msgid "Method"
msgstr "Method"
-#: classes/Gems/Email/MultiMailForm.php:105
-#: classes/Gems/Email/OneMailForm.php:87
-msgid "To"
-msgstr "To"
-
#: classes/Gems/Email/MultiMailForm.php:126
msgid "Survey has been taken."
msgstr "Survey has been taken."
@@ -2505,26 +2514,30 @@
msgstr "Some help for this export"
#: classes/Gems/Menu/MenuAbstract.php:206
+msgid "Activity"
+msgstr "Activity"
+
+#: classes/Gems/Menu/MenuAbstract.php:209
msgid "Servers"
msgstr "Servers"
-#: classes/Gems/Menu/MenuAbstract.php:210
+#: classes/Gems/Menu/MenuAbstract.php:213
msgid "Templates"
msgstr "Templates"
-#: classes/Gems/Menu/MenuAbstract.php:243
+#: classes/Gems/Menu/MenuAbstract.php:246
msgid "By period"
msgstr "By period"
-#: classes/Gems/Menu/MenuAbstract.php:244
+#: classes/Gems/Menu/MenuAbstract.php:247
msgid "By token"
msgstr "By token"
-#: classes/Gems/Menu/MenuAbstract.php:245
+#: classes/Gems/Menu/MenuAbstract.php:248
msgid "By respondent"
msgstr "By respondent"
-#: classes/Gems/Menu/MenuAbstract.php:249
+#: classes/Gems/Menu/MenuAbstract.php:252
msgid "Bulk mail"
msgstr "Bulk mail"
@@ -3496,9 +3509,8 @@
msgid "This track can be assigned since %s."
msgstr "This track can be assigned since %s."
-#: views/scripts/index/login.phtml:12
-msgid "The Pulse software was made possible thanks to support from "
-msgstr "The Pulse software was made possible thanks to support from "
+#~ msgid "The Pulse software was made possible thanks to support from "
+#~ msgstr "The Pulse software was made possible thanks to support from "
#~ msgid "Email"
#~ msgstr "Email"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2011-09-19 13:46:53 UTC (rev 39)
+++ trunk/library/languages/default-nl.po 2011-09-19 16:29:20 UTC (rev 40)
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: Pulse NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-19 09:57+0100\n"
+"POT-Creation-Date: 2011-09-19 18:16+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Menno Dekker <men...@er...>\n"
+"Last-Translator: Matijs de Jong <mj...@ma...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -473,56 +473,56 @@
msgid "No %s found"
msgstr "Geen %s gevonden"
-#: classes/Gems/Controller/BrowseEditAction.php:634
+#: classes/Gems/Controller/BrowseEditAction.php:635
#, php-format
msgid "No %s found."
msgstr "Geen %s gevonden."
-#: classes/Gems/Controller/BrowseEditAction.php:749
+#: classes/Gems/Controller/BrowseEditAction.php:750
msgid "Are you sure?"
msgstr "Weet u het zeker?"
-#: classes/Gems/Controller/BrowseEditAction.php:765
+#: classes/Gems/Controller/BrowseEditAction.php:766
msgid "Yes"
msgstr "Ja"
-#: classes/Gems/Controller/BrowseEditAction.php:766
+#: classes/Gems/Controller/BrowseEditAction.php:767
msgid "No"
msgstr "Nee"
-#: classes/Gems/Controller/BrowseEditAction.php:819
+#: classes/Gems/Controller/BrowseEditAction.php:820
#, php-format
msgid "Unknown %s requested"
msgstr "Onjuist %s verzoek"
-#: classes/Gems/Controller/BrowseEditAction.php:842
+#: classes/Gems/Controller/BrowseEditAction.php:843
#, php-format
msgid "New %1$s..."
msgstr "Nieuwe %1$s..."
-#: classes/Gems/Controller/BrowseEditAction.php:850
+#: classes/Gems/Controller/BrowseEditAction.php:851
msgid "Save"
msgstr "Opslaan"
-#: classes/Gems/Controller/BrowseEditAction.php:886
+#: classes/Gems/Controller/BrowseEditAction.php:887
#, php-format
msgid "%2$u %1$s saved"
msgstr "%2$u %1$s opgeslagen"
-#: classes/Gems/Controller/BrowseEditAction.php:889
+#: classes/Gems/Controller/BrowseEditAction.php:890
msgid "No changes to save."
msgstr "Geen verandering om op te slaan."
-#: classes/Gems/Controller/BrowseEditAction.php:898
+#: classes/Gems/Controller/BrowseEditAction.php:899
msgid "Input error! No changes saved!"
msgstr "Invoer fout! Veranderingen niet opgeslagen!"
-#: classes/Gems/Controller/BrowseEditAction.php:926
+#: classes/Gems/Controller/BrowseEditAction.php:927
#, php-format
msgid "Show %s"
msgstr "Toon %s"
-#: classes/Gems/Controller/BrowseEditAction.php:933
+#: classes/Gems/Controller/BrowseEditAction.php:934
#, php-format
msgid "Unknown %s."
msgstr "%s is onbekend."
@@ -629,10 +629,13 @@
msgstr "Er wordt geen verschil gemaakt tussen het getal nul en de letter O en ook niet tussen het getal één en de letter L."
#: classes/Gems/Default/ConsentAction.php:66
+#: classes/Gems/Default/CountryAction.php:67
+#: classes/Gems/Default/GroupAction.php:87
msgid "Description"
msgstr "Omschrijving"
#: classes/Gems/Default/ConsentAction.php:68
+#: classes/Gems/Default/DatabaseAction.php:155
msgid "Order"
msgstr "Volgorde"
@@ -751,7 +754,6 @@
msgstr "Groep"
#: classes/Gems/Default/DatabaseAction.php:156
-#: classes/Gems/Default/OrganizationAction.php:116
msgid "Location"
msgstr "Locatie"
@@ -1043,7 +1045,6 @@
msgstr "Rol"
#: classes/Gems/Default/GroupAction.php:91
-#: classes/Gems/Default/OrganizationAction.php:132
msgid "Active"
msgstr "Actief"
@@ -1224,6 +1225,7 @@
msgstr "Logboek onderhoud"
#: classes/Gems/Default/MailAction.php:61
+#: classes/Gems/Default/MailLogAction.php:71
msgid "Subject"
msgstr "Onderwerp"
@@ -1241,6 +1243,22 @@
msgid "Email templates"
msgstr "Email sjabloon"
+#: classes/Gems/Default/MailLogAction.php:69
+msgid "To"
+msgstr "Aan"
+
+#: classes/Gems/Default/MailLogAction.php:70
+msgid "From"
+msgstr "Van"
+
+#: classes/Gems/Default/MailLogAction.php:72
+msgid "Date sent"
+msgstr "Datum verstuurd"
+
+#: classes/Gems/Default/MailLogAction.php:80
+msgid "Mail Activity Log"
+msgstr "Logboek Mail Activiteit"
+
#: classes/Gems/Default/MailServerAction.php:68
msgid "From address [part]"
msgstr "Vanaf adres [gedeelte]"
@@ -1282,8 +1300,6 @@
msgstr "Gebruikers ID"
#: classes/Gems/Default/MailServerAction.php:90
-#: classes/Gems/Default/OptionAction.php:107
-#: classes/Gems/Default/OptionAction.php:112
msgid "Repeat password"
msgstr "Herhaal wachtwoord"
@@ -1303,10 +1319,13 @@
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
+#: classes/Gems/Default/RespondentAction.php:164
+#: classes/Gems/Default/StaffAction.php:192
msgid "Language"
msgstr "Taal"
#: classes/Gems/Default/OptionAction.php:74
+#: classes/Gems/Default/StaffAction.php:193
msgid "Logout on survey"
msgstr "Logout bij beantwoorden vragenlijst"
@@ -1371,6 +1390,7 @@
msgstr "Ongeldige organisatie."
#: classes/Gems/Default/OrganizationAction.php:117
+#: classes/Gems/Default/SourceAction.php:143
msgid "Url"
msgstr "Url"
@@ -1533,13 +1553,6 @@
msgid "By"
msgstr "Door"
-#: classes/Gems/Default/ProjectSurveysAction.php:69
-#: classes/Gems/Default/ProjectTracksAction.php:67
-#: classes/Gems/Default/SurveyAction.php:193
-#: classes/Gems/Default/TrackAction.php:329
-msgid "From"
-msgstr "Van"
-
#: classes/Gems/Default/ProjectSurveysAction.php:70
#: classes/Gems/Default/ProjectTracksAction.php:68
#: classes/Gems/Default/SurveyAction.php:195
@@ -1583,7 +1596,6 @@
msgstr "Vragenlijst niet opgegeven."
#: classes/Gems/Default/ProjectTracksAction.php:120
-#: classes/Gems/Default/TrackActionAbstract.php:479
#, php-format
msgid "Track %s does not exist."
msgstr "Trajectnummer %s bestaat niet."
@@ -2282,10 +2294,12 @@
msgstr "Vrije tekst"
#: classes/Gems/Default/TrackFieldsAction.php:114
+#: classes/Gems/Default/TrackMaintenanceAction.php:211
msgid "Values"
msgstr "Waarden"
#: classes/Gems/Default/TrackFieldsAction.php:116
+#: classes/Gems/Default/TrackMaintenanceAction.php:213
msgid "Required"
msgstr "Verplicht"
@@ -2431,11 +2445,6 @@
msgid "Method"
msgstr "Methode"
-#: classes/Gems/Email/MultiMailForm.php:105
-#: classes/Gems/Email/OneMailForm.php:87
-msgid "To"
-msgstr "Aan"
-
#: classes/Gems/Email/MultiMailForm.php:126
msgid "Survey has been taken."
msgstr "Vragenlijsten is al afgenomen"
@@ -2505,26 +2514,30 @@
msgstr "Uitleg over deze export mogelijkheid"
#: classes/Gems/Menu/MenuAbstract.php:206
+msgid "Activity"
+msgstr "Activiteit"
+
+#: classes/Gems/Menu/MenuAbstract.php:209
msgid "Servers"
msgstr "Servers"
-#: classes/Gems/Menu/MenuAbstract.php:210
+#: classes/Gems/Menu/MenuAbstract.php:213
msgid "Templates"
msgstr "Sjablonen"
-#: classes/Gems/Menu/MenuAbstract.php:243
+#: classes/Gems/Menu/MenuAbstract.php:246
msgid "By period"
msgstr "Per periode"
-#: classes/Gems/Menu/MenuAbstract.php:244
+#: classes/Gems/Menu/MenuAbstract.php:247
msgid "By token"
msgstr "Per kenmerk"
-#: classes/Gems/Menu/MenuAbstract.php:245
+#: classes/Gems/Menu/MenuAbstract.php:248
msgid "By respondent"
msgstr "Per patiënt"
-#: classes/Gems/Menu/MenuAbstract.php:249
+#: classes/Gems/Menu/MenuAbstract.php:252
msgid "Bulk mail"
msgstr "Bulk mail"
@@ -3496,9 +3509,8 @@
msgid "This track can be assigned since %s."
msgstr "Dit traject kan sinds %s aan een patiënt toegewezen worden."
-#: views/scripts/index/login.phtml:12
-msgid "The Pulse software was made possible thanks to support from "
-msgstr "De PULSE software is mede mogelijk gemaakt met steun van "
+#~ msgid "The Pulse software was made possible thanks to support from "
+#~ msgstr "De PULSE software is mede mogelijk gemaakt met steun van "
#~ msgid "Email"
#~ msgstr "Email"
Added: trunk/library/snippets/Generic/AutosearchForm.php
===================================================================
--- trunk/library/snippets/Generic/Autosear...
[truncated message content] |
|
From: <gem...@li...> - 2011-09-19 13:46:59
|
Revision: 39
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=39&view=rev
Author: mennodekker
Date: 2011-09-19 13:46:53 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
fix for tooltips
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems-new.css
Modified: trunk/new_project/htdocs/gems/css/gems-new.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-19 13:38:23 UTC (rev 38)
+++ trunk/new_project/htdocs/gems/css/gems-new.css 2011-09-19 13:46:53 UTC (rev 39)
@@ -653,4 +653,8 @@
.tracksList p {
margin-bottom: 0.25em;
+}
+
+span.thetooltip {
+display: none;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-19 13:38:32
|
Revision: 38
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=38&view=rev
Author: mennodekker
Date: 2011-09-19 13:38:23 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Fixed broken favicons
Modified Paths:
--------------
trunk/library/classes/GemsEscort.php
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2011-09-19 11:21:51 UTC (rev 37)
+++ trunk/library/classes/GemsEscort.php 2011-09-19 13:38:23 UTC (rev 38)
@@ -594,7 +594,7 @@
{
// FAVICON
$icon = isset($this->project->favicon) ? $this->project->favicon : 'favicon.ico';
- if (file_exists(GEMS_ROOT_DIR . '/' . $icon)) {
+ if (file_exists(GEMS_WEB_DIR . '/' . $icon)) {
$this->view->headLink(array(
'rel' => 'shortcut icon',
'href' => $this->basepath->getBasePath() . '/' . $icon,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-19 11:21:57
|
Revision: 37
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=37&view=rev
Author: matijsdejong
Date: 2011-09-19 11:21:51 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
- small fix: disable click through to edit screen for survey and track displays
Modified Paths:
--------------
trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php
Modified: trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php
===================================================================
--- trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php 2011-09-19 10:47:08 UTC (rev 36)
+++ trunk/library/snippets/RespondentDetailsWithAssignmentsSnippet.php 2011-09-19 11:21:51 UTC (rev 37)
@@ -158,6 +158,8 @@
foreach ($tr as $td) {
if (strpos($td->class, 'linked') === false) {
$td->onclick = $href;
+ } else {
+ $td->onclick = 'event.cancelBubble=true;';
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-19 10:47:15
|
Revision: 36
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=36&view=rev
Author: matijsdejong
Date: 2011-09-19 10:47:08 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
- added hanging indent to menu items
Modified Paths:
--------------
trunk/new_project/htdocs/gems/css/gems.css
Modified: trunk/new_project/htdocs/gems/css/gems.css
===================================================================
--- trunk/new_project/htdocs/gems/css/gems.css 2011-09-19 10:35:16 UTC (rev 35)
+++ trunk/new_project/htdocs/gems/css/gems.css 2011-09-19 10:47:08 UTC (rev 36)
@@ -249,14 +249,15 @@
display: block;
*height: 1%; /* IE 6 Fix */
margin: 0;
- padding: 0;
+ padding: 0 0 0 0.5em;
+ text-indent: -0.5em;
*width: 115px; /* IE 6 Fix */
}
#menu ul li a.breakBefore {
border-top: 1px dotted;
margin: 3px 4px 0 0;
- padding: 2px 0 0 0;
+ padding: 2px 0 0 0.5em;
}
#menu ul li a.noParameters {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-19 10:35:22
|
Revision: 35
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=35&view=rev
Author: matijsdejong
Date: 2011-09-19 10:35:16 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
- created readonly option for request cache to prevent bug #8
Modified Paths:
--------------
trunk/library/classes/Gems/Controller/BrowseEditAction.php
trunk/library/classes/Gems/Default/TokenPlanAction.php
trunk/library/classes/Gems/Util/RequestCache.php
Modified: trunk/library/classes/Gems/Controller/BrowseEditAction.php
===================================================================
--- trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-09-19 08:19:00 UTC (rev 34)
+++ trunk/library/classes/Gems/Controller/BrowseEditAction.php 2011-09-19 10:35:16 UTC (rev 35)
@@ -585,13 +585,14 @@
* @param string $sourceAction The action to get the cache from if not the current one.
* @return array
*/
- public function getCachedRequestData($includeDefaults = true, $sourceAction = null)
+ public function getCachedRequestData($includeDefaults = true, $sourceAction = null, $readonly = false)
{
if (! $this->requestCache) {
$this->requestCache = $this->util->getRequestCache();
if ($sourceAction) {
$this->requestCache->setSourceAction($sourceAction);
}
+ $this->requestCache->setReadonly($readonly);
$this->requestCache->setMenu($this->menu);
$this->requestCache->setRequest($this->request);
Modified: trunk/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- trunk/library/classes/Gems/Default/TokenPlanAction.php 2011-09-19 08:19:00 UTC (rev 34)
+++ trunk/library/classes/Gems/Default/TokenPlanAction.php 2011-09-19 10:35:16 UTC (rev 35)
@@ -128,7 +128,7 @@
$model = $this->getModel();
// Set the request cache to use the search params from the index action
- $this->getCachedRequestData(true, 'index');
+ $this->getCachedRequestData(true, 'index', true);
// Load the filters
$this->_applySearchParameters($model);
Modified: trunk/library/classes/Gems/Util/RequestCache.php
===================================================================
--- trunk/library/classes/Gems/Util/RequestCache.php 2011-09-19 08:19:00 UTC (rev 34)
+++ trunk/library/classes/Gems/Util/RequestCache.php 2011-09-19 10:35:16 UTC (rev 35)
@@ -64,6 +64,13 @@
protected $_programParams = array();
/**
+ * True if the cache should not be written to.
+ *
+ * @var boolean
+ */
+ protected $_readonly = false;
+
+ /**
* The module / controller /action of the request in an array.
*
* @var array
@@ -269,6 +276,12 @@
return $this;
}
+ /**
+ * Ste the keys stored fot this cache
+ *
+ * @param array $programParams
+ * @return Gems_Util_RequestCache (continuation pattern)
+ */
public function setProgramParams(array $programParams)
{
foreach ($programParams as $key => $value) {
@@ -279,13 +292,29 @@
// Store result
$this->_programParams = $programParams;
- $this->session->requestCache[$this->getStorageKey()] = $programParams;
+ if (! $this->_readonly) {
+ $this->session->requestCache[$this->getStorageKey()] = $programParams;
+ }
+
return $this;
}
/**
+ * Makes sure any new values in the request are not written to the cache.
*
+ * @param boolen $value
+ * @return Gems_Util_RequestCache (continuation pattern)
+ */
+ public function setReadonly($value = true)
+ {
+ $this->_readonly = (boolean) $value;
+
+ return $this;
+ }
+
+ /**
+ *
* @param Zend_Controller_Request_Abstract $request
* @return Gems_Util_RequestCache (continuation pattern)
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-19 08:19:06
|
Revision: 34
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=34&view=rev
Author: mennodekker
Date: 2011-09-19 08:19:00 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Minor improvements for new_project
Modified Paths:
--------------
trunk/new_project/application/configs/project.ini
trunk/new_project/htdocs/.htaccess
Modified: trunk/new_project/application/configs/project.ini
===================================================================
--- trunk/new_project/application/configs/project.ini 2011-09-19 08:07:34 UTC (rev 33)
+++ trunk/new_project/application/configs/project.ini 2011-09-19 08:19:00 UTC (rev 34)
@@ -10,9 +10,8 @@
favicon = "erasmusmc/erasmusmc.ico"
jquerycss = "erasmusmc/css/jquery-mc.css"
-contact.bugsUrl = http://survey.erasmusmc.nl/support/mantis/my_view_page.php
-contact.supportUrl = http://survey.erasmusmc.nl/support/
-
+contact.bugsUrl = https://sourceforge.net/apps/trac/gemstracker/wiki
+contact.supportUrl = https://sourceforge.net/projects/gemstracker/support
databaseFileEncoding = ISO-8859-1
;-------------------------------------------------------
Modified: trunk/new_project/htdocs/.htaccess
===================================================================
--- trunk/new_project/htdocs/.htaccess 2011-09-19 08:07:34 UTC (rev 33)
+++ trunk/new_project/htdocs/.htaccess 2011-09-19 08:19:00 UTC (rev 34)
@@ -1,6 +1,7 @@
Options +FollowSymlinks
php_flag magic_quotes_gpc off
+php_value memory_limit 32M
#SetEnv APPLICATION_ENV development
@@ -10,5 +11,4 @@
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
-RewriteRule !\.(js|ico|gif|jpg|png|css)$ index.php [NC,L]
-#RewriteRule ^.*$ index.php [NC,L]
\ No newline at end of file
+RewriteRule !\.(js|ico|gif|jpg|png|css)$ index.php [NC,L]
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-19 08:07:42
|
Revision: 33
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=33&view=rev
Author: mennodekker
Date: 2011-09-19 08:07:34 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Updated sources to be 'survey sources' instead of 'lime survey sources' and updated translations
Modified Paths:
--------------
trunk/library/classes/Gems/Default/SourceAction.php
trunk/library/languages/default-en.mo
trunk/library/languages/default-en.po
trunk/library/languages/default-nl.mo
trunk/library/languages/default-nl.po
Modified: trunk/library/classes/Gems/Default/SourceAction.php
===================================================================
--- trunk/library/classes/Gems/Default/SourceAction.php 2011-09-16 15:14:56 UTC (rev 32)
+++ trunk/library/classes/Gems/Default/SourceAction.php 2011-09-19 08:07:34 UTC (rev 33)
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- *
+ *
* @package Gems
* @subpackage Default
* @author Matijs de Jong <mj...@ma...>
@@ -191,7 +191,7 @@
public function getTopicTitle()
{
- return $this->_('Lime Survey Sources');
+ return $this->_('Survey Sources');
}
public function pingAction()
Modified: trunk/library/languages/default-en.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-en.po
===================================================================
--- trunk/library/languages/default-en.po 2011-09-16 15:14:56 UTC (rev 32)
+++ trunk/library/languages/default-en.po 2011-09-19 08:07:34 UTC (rev 33)
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: Pulse EN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 16:26+0100\n"
+"POT-Creation-Date: 2011-09-19 10:05+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,34 +32,34 @@
msgid "version"
msgstr "version"
-#: classes/GemsEscort.php:1401
+#: classes/GemsEscort.php:1422
msgid "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
msgstr "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
-#: classes/GemsEscort.php:1523
+#: classes/GemsEscort.php:1544
msgid "No access to site."
msgstr "No access to site."
-#: classes/GemsEscort.php:1525
-#: classes/GemsEscort.php:1561
+#: classes/GemsEscort.php:1546
+#: classes/GemsEscort.php:1582
msgid "You have no access to this site."
msgstr "You have no access to this site."
-#: classes/GemsEscort.php:1541
+#: classes/GemsEscort.php:1562
msgid "No access to page"
msgstr "No access to page"
-#: classes/GemsEscort.php:1543
+#: classes/GemsEscort.php:1564
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "Access to this page is not allowed for current role: %s."
-#: classes/GemsEscort.php:1548
-#: classes/GemsEscort.php:1559
+#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1580
msgid "You are no longer logged in."
msgstr "You are no longer logged in."
-#: classes/GemsEscort.php:1549
+#: classes/GemsEscort.php:1570
msgid "You must login to access this page."
msgstr "You must login to access this page."
@@ -153,234 +153,230 @@
msgstr "Project setup"
#: classes/Gems/Menu.php:188
-msgid "ACL"
-msgstr "ACL"
-
-#: classes/Gems/Menu.php:189
msgid "Errors"
msgstr "Errors"
-#: classes/Gems/Menu.php:190
+#: classes/Gems/Menu.php:189
msgid "PHP"
msgstr "PHP"
-#: classes/Gems/Menu.php:191
-msgid "Privileges"
-msgstr "Privileges"
-
-#: classes/Gems/Menu.php:192
-#: classes/Gems/Menu.php:589
+#: classes/Gems/Menu.php:190
+#: classes/Gems/Menu.php:581
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:193
-#: classes/Gems/Menu.php:212
-msgid "Roles"
-msgstr "Roles"
-
-#: classes/Gems/Menu.php:194
+#: classes/Gems/Menu.php:191
msgid "Session"
msgstr "Session"
-#: classes/Gems/Menu.php:203
+#: classes/Gems/Menu.php:200
msgid "Consents"
msgstr "Consents"
-#: classes/Gems/Menu.php:206
+#: classes/Gems/Menu.php:203
msgid "Organizations"
msgstr "Organizations"
-#: classes/Gems/Menu.php:209
+#: classes/Gems/Menu.php:206
msgid "Groups"
msgstr "Groups"
-#: classes/Gems/Menu.php:216
+#: classes/Gems/Menu.php:209
+msgid "Roles"
+msgstr "Roles"
+
+#: classes/Gems/Menu.php:210
+msgid "ACL"
+msgstr "ACL"
+
+#: classes/Gems/Menu.php:211
+#: classes/Gems/Menu.php:398
+msgid "Assigned"
+msgstr "Assigned"
+
+#: classes/Gems/Menu.php:212
+msgid "Privileges"
+msgstr "Privileges"
+
+#: classes/Gems/Menu.php:215
msgid "Reception codes"
msgstr "Reception codes"
-#: classes/Gems/Menu.php:219
-msgid "Email servers"
-msgstr "Email servers"
-
-#: classes/Gems/Menu.php:223
-msgid "Email"
-msgstr "Email"
-
-#: classes/Gems/Menu.php:226
+#: classes/Gems/Menu.php:218
msgid "Survey Sources"
msgstr "Survey Sources"
-#: classes/Gems/Menu.php:228
+#: classes/Gems/Menu.php:220
msgid "Check status"
msgstr "Check status"
-#: classes/Gems/Menu.php:229
+#: classes/Gems/Menu.php:221
msgid "Synchronize surveys"
msgstr "Synchronize surveys"
-#: classes/Gems/Menu.php:230
-#: classes/Gems/Menu.php:241
+#: classes/Gems/Menu.php:222
+#: classes/Gems/Menu.php:233
msgid "Check answers"
msgstr "Check answers"
-#: classes/Gems/Menu.php:231
+#: classes/Gems/Menu.php:223
msgid "Synchronize all surveys"
msgstr "Synchronize all surveys"
-#: classes/Gems/Menu.php:232
-#: classes/Gems/Menu.php:242
+#: classes/Gems/Menu.php:224
+#: classes/Gems/Menu.php:234
msgid "Check all answers"
msgstr "Check all answers"
-#: classes/Gems/Menu.php:235
-#: classes/Gems/Menu.php:396
+#: classes/Gems/Menu.php:227
+#: classes/Gems/Menu.php:388
msgid "Surveys"
msgstr "Surveys"
-#: classes/Gems/Menu.php:238
+#: classes/Gems/Menu.php:230
msgid "PDF"
msgstr "PDF"
-#: classes/Gems/Menu.php:247
-#: classes/Gems/Menu.php:362
+#: classes/Gems/Menu.php:239
+#: classes/Gems/Menu.php:354
msgid "Tracks"
msgstr "Tracks"
-#: classes/Gems/Menu.php:250
+#: classes/Gems/Menu.php:242
msgid "Fields"
msgstr "Fields"
-#: classes/Gems/Menu.php:257
+#: classes/Gems/Menu.php:249
msgid "Rounds"
msgstr "Rounds"
-#: classes/Gems/Menu.php:266
+#: classes/Gems/Menu.php:258
msgid "Round"
msgstr "Round"
-#: classes/Gems/Menu.php:272
+#: classes/Gems/Menu.php:264
msgid "Check assignments"
msgstr "Check assignments"
-#: classes/Gems/Menu.php:275
+#: classes/Gems/Menu.php:267
msgid "Check all assignments"
msgstr "Check all assignments"
-#: classes/Gems/Menu.php:278
+#: classes/Gems/Menu.php:270
msgid "Logging"
msgstr "Logging"
-#: classes/Gems/Menu.php:282
+#: classes/Gems/Menu.php:274
msgid "Maintenance"
msgstr "Maintenance"
-#: classes/Gems/Menu.php:296
+#: classes/Gems/Menu.php:288
#, php-format
msgid "Stand-alone privilige: %s"
msgstr "Stand-alone privilige: %s"
-#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:295
msgid "Logon"
msgstr "Logon"
-#: classes/Gems/Menu.php:304
+#: classes/Gems/Menu.php:296
msgid "Lost password"
msgstr "Lost password"
-#: classes/Gems/Menu.php:305
+#: classes/Gems/Menu.php:297
msgid "Your account"
msgstr "Your account"
-#: classes/Gems/Menu.php:306
+#: classes/Gems/Menu.php:298
msgid "Activity overview"
msgstr "Activity overview"
-#: classes/Gems/Menu.php:307
+#: classes/Gems/Menu.php:299
msgid "Change password"
msgstr "Change password"
-#: classes/Gems/Menu.php:308
-#: classes/Gems/Menu.php:348
-#: classes/Gems/Menu.php:383
+#: classes/Gems/Menu.php:300
+#: classes/Gems/Menu.php:340
+#: classes/Gems/Menu.php:375
msgid "Token"
msgstr "Token"
-#: classes/Gems/Menu.php:309
+#: classes/Gems/Menu.php:301
msgid "Logoff"
msgstr "Logoff"
-#: classes/Gems/Menu.php:344
+#: classes/Gems/Menu.php:336
msgid "Track"
msgstr "Track"
-#: classes/Gems/Menu.php:351
-#: classes/Gems/Menu.php:371
-#: classes/Gems/Menu.php:402
+#: classes/Gems/Menu.php:343
+#: classes/Gems/Menu.php:363
+#: classes/Gems/Menu.php:394
msgid "Add"
msgstr "Add"
-#: classes/Gems/Menu.php:355
-#: classes/Gems/Menu.php:438
+#: classes/Gems/Menu.php:347
+#: classes/Gems/Menu.php:430
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:375
+#: classes/Gems/Menu.php:367
msgid "Assignments"
msgstr "Assignments"
-#: classes/Gems/Menu.php:379
+#: classes/Gems/Menu.php:371
msgid "Show"
msgstr "Show"
-#: classes/Gems/Menu.php:387
+#: classes/Gems/Menu.php:379
msgid "Edit"
msgstr "Edit"
-#: classes/Gems/Menu.php:391
+#: classes/Gems/Menu.php:383
msgid "Delete"
msgstr "Delete"
-#: classes/Gems/Menu.php:406
-msgid "Assigned"
-msgstr "Assigned"
-
-#: classes/Gems/Menu.php:428
+#: classes/Gems/Menu.php:420
msgid "Fill in"
msgstr "Fill in"
-#: classes/Gems/Menu.php:432
+#: classes/Gems/Menu.php:424
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:435
+#: classes/Gems/Menu.php:427
msgid "E-Mail now!"
msgstr "E-Mail now!"
-#: classes/Gems/Menu.php:441
+#: classes/Gems/Menu.php:433
msgid "Answers"
msgstr "Answers"
-#: classes/Gems/Menu.php:579
+#: classes/Gems/Menu.php:571
msgid "Respondents"
msgstr "Patients"
-#: classes/Gems/Menu.php:582
+#: classes/Gems/Menu.php:574
msgid "Overview"
msgstr "Overview"
-#: classes/Gems/Menu.php:592
+#: classes/Gems/Menu.php:584
msgid "Staff"
msgstr "Staff"
-#: classes/Gems/Menu.php:595
+#: classes/Gems/Menu.php:587
msgid "Setup"
msgstr "Setup"
-#: classes/Gems/Menu.php:601
+#: classes/Gems/Menu.php:590
+msgid "Mail"
+msgstr "Mail"
+
+#: classes/Gems/Menu.php:599
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:613
+#: classes/Gems/Menu.php:612
msgid "Changelog"
msgstr "Changelog"
@@ -882,7 +878,6 @@
msgstr "%d new or changed patch(es)."
#: classes/Gems/Default/DatabaseAction.php:317
-#: classes/Gems/Default/ProjectInformationAction.php:114
msgid "Gems build"
msgstr "Gems build"
@@ -1018,8 +1013,32 @@
msgid "Contents of %s %s"
msgstr "Contents of %s %s"
+#: classes/Gems/Default/ExportAction.php:69
+msgid "Data"
+msgstr "Data"
+
+#: classes/Gems/Default/ExportAction.php:74
+msgid "Export data"
+msgstr "Export data"
+
+#: classes/Gems/Default/ExportAction.php:161
+msgid "Survey"
+msgstr "Survey"
+
+#: classes/Gems/Default/ExportAction.php:178
+#, php-format
+msgid "%s records found."
+msgstr "%s records found."
+
+#: classes/Gems/Default/ExportAction.php:182
+msgid "Organization"
+msgstr "Organization"
+
+#: classes/Gems/Default/ExportAction.php:190
+msgid "Export to"
+msgstr "Export to"
+
#: classes/Gems/Default/GroupAction.php:88
-#: classes/Gems/Default/ProjectInformationAction.php:174
msgid "Role"
msgstr "Role"
@@ -1224,7 +1243,7 @@
#: classes/Gems/Default/MailServerAction.php:68
msgid "From address [part]"
-msgstr ""
+msgstr "From address [part]"
#: classes/Gems/Default/MailServerAction.php:70
msgid "E.g.: '%', '%.org' or '%@gemstracker.org' or 'ro...@ge...'."
@@ -1278,6 +1297,10 @@
msgstr[0] "email server"
msgstr[1] "email servers"
+#: classes/Gems/Default/MailServerAction.php:105
+msgid "Email servers"
+msgstr "Email servers"
+
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
msgid "Language"
@@ -1391,6 +1414,9 @@
msgstr "Participating organizations"
#: classes/Gems/Default/OverviewPlanAction.php:115
+#: classes/Gems/Default/ProjectSurveysAction.php:88
+#: classes/Gems/Default/SurveyAction.php:203
+#: classes/Gems/Default/SurveyMaintenanceAction.php:424
msgid "survey"
msgid_plural "surveys"
msgstr[0] "survey"
@@ -1400,147 +1426,108 @@
msgid "Planning overview"
msgstr "Planning overview"
-#: classes/Gems/Default/ProjectInformationAction.php:59
-msgid "Access Control Lists"
-msgstr "Access Control Lists"
-
-#: classes/Gems/Default/ProjectInformationAction.php:60
-msgid "ACL's"
-msgstr "ACL's"
-
-#: classes/Gems/Default/ProjectInformationAction.php:77
+#: classes/Gems/Default/ProjectInformationAction.php:71
#, php-format
msgid "No changelog found. Place one in %s."
msgstr "No changelog found. Place one in %s."
-#: classes/Gems/Default/ProjectInformationAction.php:83
+#: classes/Gems/Default/ProjectInformationAction.php:77
msgid "Logged errors"
msgstr "Logged errors"
-#: classes/Gems/Default/ProjectInformationAction.php:94
-#: classes/Gems/Default/ProjectInformationAction.php:101
+#: classes/Gems/Default/ProjectInformationAction.php:88
+#: classes/Gems/Default/ProjectInformationAction.php:95
msgid "Empty logfile"
msgstr "Empty logfile"
-#: classes/Gems/Default/ProjectInformationAction.php:100
+#: classes/Gems/Default/ProjectInformationAction.php:94
msgid "No logged errors found."
msgstr "No logged errors found."
-#: classes/Gems/Default/ProjectInformationAction.php:107
+#: classes/Gems/Default/ProjectInformationAction.php:101
msgid "Project information"
msgstr "Project information"
-#: classes/Gems/Default/ProjectInformationAction.php:111
+#: classes/Gems/Default/ProjectInformationAction.php:105
msgid "Project name"
msgstr "Project name"
-#: classes/Gems/Default/ProjectInformationAction.php:112
+#: classes/Gems/Default/ProjectInformationAction.php:106
msgid "Project version"
msgstr "Project version"
-#: classes/Gems/Default/ProjectInformationAction.php:113
+#: classes/Gems/Default/ProjectInformationAction.php:107
msgid "Gems version"
msgstr "Gems version"
-#: classes/Gems/Default/ProjectInformationAction.php:115
+#: classes/Gems/Default/ProjectInformationAction.php:109
msgid "Gems project"
msgstr "Gems project"
-#: classes/Gems/Default/ProjectInformationAction.php:116
+#: classes/Gems/Default/ProjectInformationAction.php:110
msgid "Gems web directory"
msgstr "Gems web directory"
-#: classes/Gems/Default/ProjectInformationAction.php:117
+#: classes/Gems/Default/ProjectInformationAction.php:111
msgid "Gems code directory"
msgstr "Gems code directory"
-#: classes/Gems/Default/ProjectInformationAction.php:118
+#: classes/Gems/Default/ProjectInformationAction.php:112
msgid "Gems project path"
msgstr "Gems project path"
-#: classes/Gems/Default/ProjectInformationAction.php:119
+#: classes/Gems/Default/ProjectInformationAction.php:113
msgid "MUtil version"
msgstr "MUtil version"
-#: classes/Gems/Default/ProjectInformationAction.php:120
+#: classes/Gems/Default/ProjectInformationAction.php:114
msgid "Zend version"
msgstr "Zend version"
-#: classes/Gems/Default/ProjectInformationAction.php:121
+#: classes/Gems/Default/ProjectInformationAction.php:115
msgid "Application environment"
msgstr "Application environment"
-#: classes/Gems/Default/ProjectInformationAction.php:122
+#: classes/Gems/Default/ProjectInformationAction.php:116
msgid "Application baseuri"
msgstr "Application baseuri"
-#: classes/Gems/Default/ProjectInformationAction.php:123
+#: classes/Gems/Default/ProjectInformationAction.php:117
msgid "Application directory"
msgstr "Application directory"
-#: classes/Gems/Default/ProjectInformationAction.php:124
+#: classes/Gems/Default/ProjectInformationAction.php:118
msgid "PHP version"
msgstr "PHP version"
-#: classes/Gems/Default/ProjectInformationAction.php:125
+#: classes/Gems/Default/ProjectInformationAction.php:119
msgid "Server Hostname"
msgstr "Server Hostname"
-#: classes/Gems/Default/ProjectInformationAction.php:126
+#: classes/Gems/Default/ProjectInformationAction.php:120
msgid "Server OS"
msgstr "Server OS"
-#: classes/Gems/Default/ProjectInformationAction.php:127
+#: classes/Gems/Default/ProjectInformationAction.php:121
msgid "Time on server"
msgstr "Time on server"
-#: classes/Gems/Default/ProjectInformationAction.php:129
+#: classes/Gems/Default/ProjectInformationAction.php:123
msgid "Version information"
msgstr "Version information"
-#: classes/Gems/Default/ProjectInformationAction.php:134
+#: classes/Gems/Default/ProjectInformationAction.php:128
msgid "Server PHP Info"
msgstr "Server PHP Info"
-#: classes/Gems/Default/ProjectInformationAction.php:147
-msgid "Privilege"
-msgstr "Privilege"
-
-#: classes/Gems/Default/ProjectInformationAction.php:148
-#: classes/Gems/Default/ProjectInformationAction.php:176
-msgid "Allowed"
-msgstr "Allowed"
-
-#: classes/Gems/Default/ProjectInformationAction.php:149
-#: classes/Gems/Default/ProjectInformationAction.php:177
-msgid "Denied"
-msgstr "Denied"
-
-#: classes/Gems/Default/ProjectInformationAction.php:153
-msgid "Project privileges"
-msgstr "Project privileges"
-
-#: classes/Gems/Default/ProjectInformationAction.php:164
+#: classes/Gems/Default/ProjectInformationAction.php:141
msgid "Project settings"
msgstr "Project settings"
-#: classes/Gems/Default/ProjectInformationAction.php:175
-msgid "Parents"
-msgstr "Parents"
-
-#: classes/Gems/Default/ProjectInformationAction.php:181
-msgid "Project roles"
-msgstr "Project roles"
-
-#: classes/Gems/Default/ProjectInformationAction.php:189
+#: classes/Gems/Default/ProjectInformationAction.php:148
msgid "Session content"
msgstr "Session content"
-#: classes/Gems/Default/ProjectSurveysAction.php:67
-#: classes/Gems/Default/SurveyAction.php:191
-msgid "Survey"
-msgstr "Survey"
-
#: classes/Gems/Default/ProjectSurveysAction.php:68
#: classes/Gems/Default/SurveyAction.php:192
msgid "By"
@@ -1571,7 +1558,6 @@
#: classes/Gems/Default/ProjectTracksAction.php:85
#: classes/Gems/Default/TrackAction.php:451
-#: classes/Gems/Default/TrackMaintenanceAction.php:242
msgid "track"
msgid_plural "tracks"
msgstr[0] "track"
@@ -1783,16 +1769,51 @@
msgid "Respondent planning"
msgstr "Respondent planning"
-#: classes/Gems/Default/RoleAction.php:174
+#: classes/Gems/Default/RoleAction.php:58
+msgid "Access Control Lists"
+msgstr "Access Control Lists"
+
+#: classes/Gems/Default/RoleAction.php:59
+msgid "ACL's"
+msgstr "ACL's"
+
+#: classes/Gems/Default/RoleAction.php:168
+#: classes/Gems/Default/RoleAction.php:209
+msgid "Parents"
+msgstr "Parents"
+
+#: classes/Gems/Default/RoleAction.php:187
msgid "role"
msgid_plural "roles"
msgstr[0] "role"
msgstr[1] "roles"
-#: classes/Gems/Default/RoleAction.php:179
+#: classes/Gems/Default/RoleAction.php:192
msgid "Administrative roles"
msgstr "Administrative roles"
+#: classes/Gems/Default/RoleAction.php:210
+#: classes/Gems/Default/RoleAction.php:226
+msgid "Allowed"
+msgstr "Allowed"
+
+#: classes/Gems/Default/RoleAction.php:211
+#: classes/Gems/Default/RoleAction.php:227
+msgid "Denied"
+msgstr "Denied"
+
+#: classes/Gems/Default/RoleAction.php:215
+msgid "Project role overview"
+msgstr "Project role overview"
+
+#: classes/Gems/Default/RoleAction.php:225
+msgid "Privilege"
+msgstr "Privilege"
+
+#: classes/Gems/Default/RoleAction.php:231
+msgid "Project privileges"
+msgstr "Project privileges"
+
#: classes/Gems/Default/SourceAction.php:69
msgid "Leave empty for the Gems database."
msgstr "Leave empty for the Gems database."
@@ -1840,10 +1861,6 @@
msgstr[0] "source"
msgstr[1] "sources"
-#: classes/Gems/Default/SourceAction.php:194
-msgid "Lime Survey Sources"
-msgstr "Lime Survey Sources"
-
#: classes/Gems/Default/SourceAction.php:202
msgid "This installation is active."
msgstr "This installation is active."
@@ -1882,15 +1899,11 @@
msgid "You are not allowed to edit this staff member."
msgstr "You are not allowed to edit this staff member."
-#: classes/Gems/Default/StaffAction.php:182
-msgid "Organization"
-msgstr "Organization"
-
-#: classes/Gems/Default/StaffAction.php:186
+#: classes/Gems/Default/StaffAction.php:188
msgid "Primary function"
msgstr "Primary function"
-#: classes/Gems/Default/StaffAction.php:233
+#: classes/Gems/Default/StaffAction.php:240
msgid "staff member"
msgid_plural "staff members"
msgstr[0] "staff member"
@@ -2269,12 +2282,10 @@
msgstr "Free text"
#: classes/Gems/Default/TrackFieldsAction.php:114
-#: classes/Gems/Default/TrackMaintenanceAction.php:211
msgid "Values"
msgstr "Values"
#: classes/Gems/Default/TrackFieldsAction.php:116
-#: classes/Gems/Default/TrackMaintenanceAction.php:213
msgid "Required"
msgstr "Required"
@@ -2314,6 +2325,10 @@
msgstr "%s in track"
#: classes/Gems/Default/TrackRoundAction.php:89
+#: classes/Gems/Default/TrackRoundsAction.php:82
+#: classes/Gems/Default/TrackRoundsAction.php:109
+#: classes/Gems/Default/TrackRoundsAction.php:144
+#: classes/Gems/Default/TrackRoundsAction.php:173
msgid "Missing track identifier."
msgstr "Missing track identifier."
@@ -2442,12 +2457,12 @@
msgstr "Last contact"
#: classes/Gems/Email/OneMailForm.php:131
-#: classes/Gems/Email/TemplateMailer.php:256
+#: classes/Gems/Email/TemplateMailer.php:211
msgid "The sending of emails was blocked for this installation."
msgstr "The sending of emails was blocked for this installation."
#: classes/Gems/Email/OneMailForm.php:139
-#: classes/Gems/Email/TemplateMailer.php:286
+#: classes/Gems/Email/TemplateMailer.php:244
msgid "Mail failed to send."
msgstr "Mail failed to send."
@@ -2456,24 +2471,60 @@
msgid "Sent email to %s."
msgstr "Sent email to %s."
-#: classes/Gems/Email/TemplateMailer.php:302
+#: classes/Gems/Email/TemplateMailer.php:260
#, php-format
msgid "Sent %d e-mails, updated %d tokens."
msgstr "Sent %d e-mails, updated %d tokens."
-#: classes/Gems/Menu/MenuAbstract.php:229
+#: classes/Gems/Export/Excel.php:60
+msgid "Excel options"
+msgstr "Excel options"
+
+#: classes/Gems/Export/Excel.php:62
+msgid "Export questions instead of variable names"
+msgstr "Export questions instead of variable names"
+
+#: classes/Gems/Export/Excel.php:63
+msgid "Format answers"
+msgstr "Format answers"
+
+#: classes/Gems/Export/Spss.php:60
+msgid "Which file"
+msgstr "Which file"
+
+#: classes/Gems/Export/Spss.php:61
+msgid "syntax"
+msgstr "syntax"
+
+#: classes/Gems/Export/Spss.php:62
+msgid "data"
+msgstr "data"
+
+#: classes/Gems/Export/Spss.php:67
+msgid "Some help for this export"
+msgstr "Some help for this export"
+
+#: classes/Gems/Menu/MenuAbstract.php:206
+msgid "Servers"
+msgstr "Servers"
+
+#: classes/Gems/Menu/MenuAbstract.php:210
+msgid "Templates"
+msgstr "Templates"
+
+#: classes/Gems/Menu/MenuAbstract.php:243
msgid "By period"
msgstr "By period"
-#: classes/Gems/Menu/MenuAbstract.php:230
+#: classes/Gems/Menu/MenuAbstract.php:244
msgid "By token"
msgstr "By token"
-#: classes/Gems/Menu/MenuAbstract.php:231
+#: classes/Gems/Menu/MenuAbstract.php:245
msgid "By respondent"
msgstr "By respondent"
-#: classes/Gems/Menu/MenuAbstract.php:235
+#: classes/Gems/Menu/MenuAbstract.php:249
msgid "Bulk mail"
msgstr "Bulk mail"
@@ -2845,11 +2896,13 @@
msgstr "Add new round"
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:124
+#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:164
#, php-format
msgid "Token %s not found."
msgstr "Token %s not found."
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:128
+#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:168
msgid "No token specified."
msgstr "No token specified."
@@ -3325,6 +3378,7 @@
msgstr "Deleted token %s for survey %s."
#: snippets/DeleteTrackTokenSnippet.php:269
+#: snippets/EditTrackTokenSnippet.php:174
#, php-format
msgid "%d token changed by recalculation."
msgid_plural "%d tokens changed by recalculation."
@@ -3442,9 +3496,16 @@
msgid "This track can be assigned since %s."
msgstr "This track can be assigned since %s."
-#~ msgid "The Pulse software was made possible thanks to support from "
-#~ msgstr "The Pulse software was made possible thanks to support from "
+#: views/scripts/index/login.phtml:12
+msgid "The Pulse software was made possible thanks to support from "
+msgstr "The Pulse software was made possible thanks to support from "
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Lime Survey Sources"
+#~ msgstr "Lime Survey Sources"
+
#~ msgid "Filling in by"
#~ msgstr "Filling in by"
Modified: trunk/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: trunk/library/languages/default-nl.po
===================================================================
--- trunk/library/languages/default-nl.po 2011-09-16 15:14:56 UTC (rev 32)
+++ trunk/library/languages/default-nl.po 2011-09-19 08:07:34 UTC (rev 33)
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: Pulse NL\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-15 16:22+0100\n"
+"POT-Creation-Date: 2011-09-19 09:57+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Matijs de Jong <mj...@ma...>\n"
+"Last-Translator: Menno Dekker <men...@er...>\n"
"Language-Team: Erasmus MGZ <mat...@ma...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -32,34 +32,34 @@
msgid "version"
msgstr "versie"
-#: classes/GemsEscort.php:1401
+#: classes/GemsEscort.php:1422
msgid "Take note: your session has expired, your inputs where not saved. Please check the input data and try again"
msgstr "Let op: uw sessie is verlopen, uw invoer is niet opgeslagen. Controleer de gegevens en probeer a.u.b. opnieuw."
-#: classes/GemsEscort.php:1523
+#: classes/GemsEscort.php:1544
msgid "No access to site."
msgstr "Geen toegang tot website."
-#: classes/GemsEscort.php:1525
-#: classes/GemsEscort.php:1561
+#: classes/GemsEscort.php:1546
+#: classes/GemsEscort.php:1582
msgid "You have no access to this site."
msgstr "U heeft geen toegang tot deze website."
-#: classes/GemsEscort.php:1541
+#: classes/GemsEscort.php:1562
msgid "No access to page"
msgstr "Geen toegang tot pagina"
-#: classes/GemsEscort.php:1543
+#: classes/GemsEscort.php:1564
#, php-format
msgid "Access to this page is not allowed for current role: %s."
msgstr "U heeft geen toegang tot deze pagina. Uw huidige rol is: %s."
-#: classes/GemsEscort.php:1548
-#: classes/GemsEscort.php:1559
+#: classes/GemsEscort.php:1569
+#: classes/GemsEscort.php:1580
msgid "You are no longer logged in."
msgstr "U bent niet meer ingelogd."
-#: classes/GemsEscort.php:1549
+#: classes/GemsEscort.php:1570
msgid "You must login to access this page."
msgstr "U moet ingelogd zijn voor toegang tot deze pagina."
@@ -153,234 +153,230 @@
msgstr "Projectinfo"
#: classes/Gems/Menu.php:188
-msgid "ACL"
-msgstr "ACL"
-
-#: classes/Gems/Menu.php:189
msgid "Errors"
msgstr "Foutmeldingen"
-#: classes/Gems/Menu.php:190
+#: classes/Gems/Menu.php:189
msgid "PHP"
msgstr "PHP"
-#: classes/Gems/Menu.php:191
-msgid "Privileges"
-msgstr "Priviléges"
-
-#: classes/Gems/Menu.php:192
-#: classes/Gems/Menu.php:589
+#: classes/Gems/Menu.php:190
+#: classes/Gems/Menu.php:581
msgid "Project"
msgstr "Project"
-#: classes/Gems/Menu.php:193
-#: classes/Gems/Menu.php:212
-msgid "Roles"
-msgstr "Rollen"
-
-#: classes/Gems/Menu.php:194
+#: classes/Gems/Menu.php:191
msgid "Session"
msgstr "Sessie"
-#: classes/Gems/Menu.php:203
+#: classes/Gems/Menu.php:200
msgid "Consents"
msgstr "Toestemmingen"
-#: classes/Gems/Menu.php:206
+#: classes/Gems/Menu.php:203
msgid "Organizations"
msgstr "Organisaties"
-#: classes/Gems/Menu.php:209
+#: classes/Gems/Menu.php:206
msgid "Groups"
msgstr "Groepen"
-#: classes/Gems/Menu.php:216
+#: classes/Gems/Menu.php:209
+msgid "Roles"
+msgstr "Rollen"
+
+#: classes/Gems/Menu.php:210
+msgid "ACL"
+msgstr "ACL"
+
+#: classes/Gems/Menu.php:211
+#: classes/Gems/Menu.php:398
+msgid "Assigned"
+msgstr "Toegewezen"
+
+#: classes/Gems/Menu.php:212
+msgid "Privileges"
+msgstr "Priviléges"
+
+#: classes/Gems/Menu.php:215
msgid "Reception codes"
msgstr "Ontvangst codes"
-#: classes/Gems/Menu.php:219
-msgid "Email servers"
-msgstr "Email servers"
-
-#: classes/Gems/Menu.php:223
-msgid "Email"
-msgstr "Email"
-
-#: classes/Gems/Menu.php:226
+#: classes/Gems/Menu.php:218
msgid "Survey Sources"
msgstr "Bronnen"
-#: classes/Gems/Menu.php:228
+#: classes/Gems/Menu.php:220
msgid "Check status"
msgstr "Status controle"
-#: classes/Gems/Menu.php:229
+#: classes/Gems/Menu.php:221
msgid "Synchronize surveys"
msgstr "Synchroniseer vragenlijsten"
-#: classes/Gems/Menu.php:230
-#: classes/Gems/Menu.php:241
+#: classes/Gems/Menu.php:222
+#: classes/Gems/Menu.php:233
msgid "Check answers"
msgstr "Antwoord controle"
-#: classes/Gems/Menu.php:231
+#: classes/Gems/Menu.php:223
msgid "Synchronize all surveys"
msgstr "Synchroniseer alle vragenlijsten"
-#: classes/Gems/Menu.php:232
-#: classes/Gems/Menu.php:242
+#: classes/Gems/Menu.php:224
+#: classes/Gems/Menu.php:234
msgid "Check all answers"
msgstr "Controleer alle antwoorden"
-#: classes/Gems/Menu.php:235
-#: classes/Gems/Menu.php:396
+#: classes/Gems/Menu.php:227
+#: classes/Gems/Menu.php:388
msgid "Surveys"
msgstr "Vragenlijsten"
-#: classes/Gems/Menu.php:238
+#: classes/Gems/Menu.php:230
msgid "PDF"
msgstr "PDF"
-#: classes/Gems/Menu.php:247
-#: classes/Gems/Menu.php:362
+#: classes/Gems/Menu.php:239
+#: classes/Gems/Menu.php:354
msgid "Tracks"
msgstr "Trajecten"
-#: classes/Gems/Menu.php:250
+#: classes/Gems/Menu.php:242
msgid "Fields"
msgstr "Velden"
-#: classes/Gems/Menu.php:257
+#: classes/Gems/Menu.php:249
msgid "Rounds"
msgstr "Rondes"
-#: classes/Gems/Menu.php:266
+#: classes/Gems/Menu.php:258
msgid "Round"
msgstr "Ronde"
-#: classes/Gems/Menu.php:272
+#: classes/Gems/Menu.php:264
msgid "Check assignments"
msgstr "Controleer toewijzingen"
-#: classes/Gems/Menu.php:275
+#: classes/Gems/Menu.php:267
msgid "Check all assignments"
msgstr "Controleer alle toewijzingen"
-#: classes/Gems/Menu.php:278
+#: classes/Gems/Menu.php:270
msgid "Logging"
msgstr "Logboek"
-#: classes/Gems/Menu.php:282
+#: classes/Gems/Menu.php:274
msgid "Maintenance"
msgstr "Onderhoud"
-#: classes/Gems/Menu.php:296
+#: classes/Gems/Menu.php:288
#, php-format
msgid "Stand-alone privilige: %s"
msgstr "Zelfstandig privilege: %s"
-#: classes/Gems/Menu.php:303
+#: classes/Gems/Menu.php:295
msgid "Logon"
msgstr "Login"
-#: classes/Gems/Menu.php:304
+#: classes/Gems/Menu.php:296
msgid "Lost password"
msgstr "Wachtwoord zoek"
-#: classes/Gems/Menu.php:305
+#: classes/Gems/Menu.php:297
msgid "Your account"
msgstr "Uw account"
-#: classes/Gems/Menu.php:306
+#: classes/Gems/Menu.php:298
msgid "Activity overview"
msgstr "Activiteiten overzicht"
-#: classes/Gems/Menu.php:307
+#: classes/Gems/Menu.php:299
msgid "Change password"
msgstr "Uw wachtwoord"
-#: classes/Gems/Menu.php:308
-#: classes/Gems/Menu.php:348
-#: classes/Gems/Menu.php:383
+#: classes/Gems/Menu.php:300
+#: classes/Gems/Menu.php:340
+#: classes/Gems/Menu.php:375
msgid "Token"
msgstr "Kenmerk"
-#: classes/Gems/Menu.php:309
+#: classes/Gems/Menu.php:301
msgid "Logoff"
msgstr "Uitloggen"
-#: classes/Gems/Menu.php:344
+#: classes/Gems/Menu.php:336
msgid "Track"
msgstr "Traject"
-#: classes/Gems/Menu.php:351
-#: classes/Gems/Menu.php:371
-#: classes/Gems/Menu.php:402
+#: classes/Gems/Menu.php:343
+#: classes/Gems/Menu.php:363
+#: classes/Gems/Menu.php:394
msgid "Add"
msgstr "Voeg toe"
-#: classes/Gems/Menu.php:355
-#: classes/Gems/Menu.php:438
+#: classes/Gems/Menu.php:347
+#: classes/Gems/Menu.php:430
msgid "Preview"
msgstr "Preview"
-#: classes/Gems/Menu.php:375
+#: classes/Gems/Menu.php:367
msgid "Assignments"
msgstr "Toewijzingen"
-#: classes/Gems/Menu.php:379
+#: classes/Gems/Menu.php:371
msgid "Show"
msgstr "Toon"
-#: classes/Gems/Menu.php:387
+#: classes/Gems/Menu.php:379
msgid "Edit"
msgstr "Wijzig"
-#: classes/Gems/Menu.php:391
+#: classes/Gems/Menu.php:383
msgid "Delete"
msgstr "Verwijder"
-#: classes/Gems/Menu.php:406
-msgid "Assigned"
-msgstr "Toegewezen"
-
-#: classes/Gems/Menu.php:428
+#: classes/Gems/Menu.php:420
msgid "Fill in"
msgstr "Vul in"
-#: classes/Gems/Menu.php:432
+#: classes/Gems/Menu.php:424
msgid "Print PDF"
msgstr "Print PDF"
-#: classes/Gems/Menu.php:435
+#: classes/Gems/Menu.php:427
msgid "E-Mail now!"
msgstr "Email nu!"
-#: classes/Gems/Menu.php:441
+#: classes/Gems/Menu.php:433
msgid "Answers"
msgstr "Antwoorden"
-#: classes/Gems/Menu.php:579
+#: classes/Gems/Menu.php:571
msgid "Respondents"
msgstr "Patiënten"
-#: classes/Gems/Menu.php:582
+#: classes/Gems/Menu.php:574
msgid "Overview"
msgstr "Overzicht"
-#: classes/Gems/Menu.php:592
+#: classes/Gems/Menu.php:584
msgid "Staff"
msgstr "Medewerkers"
-#: classes/Gems/Menu.php:595
+#: classes/Gems/Menu.php:587
msgid "Setup"
msgstr "Beheer"
-#: classes/Gems/Menu.php:601
+#: classes/Gems/Menu.php:590
+msgid "Mail"
+msgstr "Email"
+
+#: classes/Gems/Menu.php:599
msgid "Contact"
msgstr "Contact"
-#: classes/Gems/Menu.php:613
+#: classes/Gems/Menu.php:612
msgid "Changelog"
msgstr "Logboek"
@@ -882,7 +878,6 @@
msgstr "%d nieuwe of veranderde patch(es)."
#: classes/Gems/Default/DatabaseAction.php:317
-#: classes/Gems/Default/ProjectInformationAction.php:114
msgid "Gems build"
msgstr "Gems bouwnummer"
@@ -1018,8 +1013,32 @@
msgid "Contents of %s %s"
msgstr "De inhoud van %s %s"
+#: classes/Gems/Default/ExportAction.php:69
+msgid "Data"
+msgstr "Data"
+
+#: classes/Gems/Default/ExportAction.php:74
+msgid "Export data"
+msgstr "Exporteer gegevens"
+
+#: classes/Gems/Default/ExportAction.php:161
+msgid "Survey"
+msgstr "Vragenlijst"
+
+#: classes/Gems/Default/ExportAction.php:178
+#, php-format
+msgid "%s records found."
+msgstr "%s records gevonden."
+
+#: classes/Gems/Default/ExportAction.php:182
+msgid "Organization"
+msgstr "Organisatie"
+
+#: classes/Gems/Default/ExportAction.php:190
+msgid "Export to"
+msgstr "Exporteer naar"
+
#: classes/Gems/Default/GroupAction.php:88
-#: classes/Gems/Default/ProjectInformationAction.php:174
msgid "Role"
msgstr "Rol"
@@ -1278,6 +1297,10 @@
msgstr[0] "email server"
msgstr[1] "email servers"
+#: classes/Gems/Default/MailServerAction.php:105
+msgid "Email servers"
+msgstr "Email servers"
+
#: classes/Gems/Default/OptionAction.php:73
#: classes/Gems/Default/OrganizationAction.php:128
msgid "Language"
@@ -1391,6 +1414,9 @@
msgstr "Deelnemende organisaties"
#: classes/Gems/Default/OverviewPlanAction.php:115
+#: classes/Gems/Default/ProjectSurveysAction.php:88
+#: classes/Gems/Default/SurveyAction.php:203
+#: classes/Gems/Default/SurveyMaintenanceAction.php:424
msgid "survey"
msgid_plural "surveys"
msgstr[0] "vragenlijst"
@@ -1400,147 +1426,108 @@
msgid "Planning overview"
msgstr "Planning overzicht"
-#: classes/Gems/Default/ProjectInformationAction.php:59
-msgid "Access Control Lists"
-msgstr "Access Control Lists"
-
-#: classes/Gems/Default/ProjectInformationAction.php:60
-msgid "ACL's"
-msgstr "ACL's"
-
-#: classes/Gems/Default/ProjectInformationAction.php:77
+#: classes/Gems/Default/ProjectInformationAction.php:71
#, php-format
msgid "No changelog found. Place one in %s."
msgstr "Geen logboek gevonden, plaats er een in %s."
-#: classes/Gems/Default/ProjectInformationAction.php:83
+#: classes/Gems/Default/ProjectInformationAction.php:77
msgid "Logged errors"
msgstr "Opgeslagen foutmeldingen"
-#: classes/Gems/Default/ProjectInformationAction.php:94
-#: classes/Gems/Default/ProjectInformationAction.php:101
+#: classes/Gems/Default/ProjectInformationAction.php:88
+#: classes/Gems/Default/ProjectInformationAction.php:95
msgid "Empty logfile"
msgstr "Verwijder alle foutmeldingen"
-#: classes/Gems/Default/ProjectInformationAction.php:100
+#: classes/Gems/Default/ProjectInformationAction.php:94
msgid "No logged errors found."
msgstr "Geen foutmeldingen gevonden."
-#: classes/Gems/Default/ProjectInformationAction.php:107
+#: classes/Gems/Default/ProjectInformationAction.php:101
msgid "Project information"
msgstr "Project informatie"
-#: classes/Gems/Default/ProjectInformationAction.php:111
+#: classes/Gems/Default/ProjectInformationAction.php:105
msgid "Project name"
msgstr "Project naam"
-#: classes/Gems/Default/ProjectInformationAction.php:112
+#: classes/Gems/Default/ProjectInformationAction.php:106
msgid "Project version"
msgstr "Project versie"
-#: classes/Gems/Default/ProjectInformationAction.php:113
+#: classes/Gems/Default/ProjectInformationAction.php:107
msgid "Gems version"
msgstr "Gems versie"
-#: classes/Gems/Default/ProjectInformationAction.php:115
+#: classes/Gems/Default/ProjectInformationAction.php:109
msgid "Gems project"
msgstr "Gems project"
-#: classes/Gems/Default/ProjectInformationAction.php:116
+#: classes/Gems/Default/ProjectInformationAction.php:110
msgid "Gems web directory"
msgstr "Gems web folder"
-#: classes/Gems/Default/ProjectInformationAction.php:117
+#: classes/Gems/Default/ProjectInformationAction.php:111
msgid "Gems code directory"
msgstr "Gems code folder"
-#: classes/Gems/Default/ProjectInformationAction.php:118
+#: classes/Gems/Default/ProjectInformationAction.php:112
msgid "Gems project path"
msgstr "Gems project folder"
-#: classes/Gems/Default/ProjectInformationAction.php:119
+#: classes/Gems/Default/ProjectInformationAction.php:113
msgid "MUtil version"
msgstr "MUtil versie"
-#: classes/Gems/Default/ProjectInformationAction.php:120
+#: classes/Gems/Default/ProjectInformationAction.php:114
msgid "Zend version"
msgstr "Zend versie"
-#: classes/Gems/Default/ProjectInformationAction.php:121
+#: classes/Gems/Default/ProjectInformationAction.php:115
msgid "Application environment"
msgstr "Applicatie omgeving"
-#: classes/Gems/Default/ProjectInformationAction.php:122
+#: classes/Gems/Default/ProjectInformationAction.php:116
msgid "Application baseuri"
msgstr "Applicatie baseuri"
-#: classes/Gems/Default/ProjectInformationAction.php:123
+#: classes/Gems/Default/ProjectInformationAction.php:117
msgid "Application directory"
msgstr "Applicatie folder"
-#: classes/Gems/Default/ProjectInformationAction.php:124
+#: classes/Gems/Default/ProjectInformationAction.php:118
msgid "PHP version"
msgstr "PHP versie"
-#: classes/Gems/Default/ProjectInformationAction.php:125
+#: classes/Gems/Default/ProjectInformationAction.php:119
msgid "Server Hostname"
msgstr "Webserver naam"
-#: classes/Gems/Default/ProjectInformationAction.php:126
+#: classes/Gems/Default/ProjectInformationAction.php:120
msgid "Server OS"
msgstr "Server besturingssysteem"
-#: classes/Gems/Default/ProjectInformationAction.php:127
+#: classes/Gems/Default/ProjectInformationAction.php:121
msgid "Time on server"
msgstr "De tijd op de server"
-#: classes/Gems/Default/ProjectInformationAction.php:129
+#: classes/Gems/Default/ProjectInformationAction.php:123
msgid "Version information"
msgstr "Versie informatie"
-#: classes/Gems/Default/ProjectInformationAction.php:134
+#: classes/Gems/Default/ProjectInformationAction.php:128
msgid "Server PHP Info"
msgstr "Server PHP Info"
-#: classes/Gems/Default/ProjectInformationAction.php:147
-msgid "Privilege"
-msgstr "Privilége"
-
-#: classes/Gems/Default/ProjectInformationAction.php:148
-#: classes/Gems/Default/ProjectInformationAction.php:176
-msgid "Allowed"
-msgstr "Toegestaan"
-
-#: classes/Gems/Default/ProjectInformationAction.php:149
-#: classes/Gems/Default/ProjectInformationAction.php:177
-msgid "Denied"
-msgstr "Geweigerd"
-
-#: classes/Gems/Default/ProjectInformationAction.php:153
-msgid "Project privileges"
-msgstr "Project priviléges"
-
-#: classes/Gems/Default/ProjectInformationAction.php:164
+#: classes/Gems/Default/ProjectInformationAction.php:141
msgid "Project settings"
msgstr "Project instellingen"
-#: classes/Gems/Default/ProjectInformationAction.php:175
-msgid "Parents"
-msgstr "Afgeleid van"
-
-#: classes/Gems/Default/ProjectInformationAction.php:181
-msgid "Project roles"
-msgstr "Project rollen"
-
-#: classes/Gems/Default/ProjectInformationAction.php:189
+#: classes/Gems/Default/ProjectInformationAction.php:148
msgid "Session content"
msgstr "Sessie inhoud"
-#: classes/Gems/Default/ProjectSurveysAction.php:67
-#: classes/Gems/Default/SurveyAction.php:191
-msgid "Survey"
-msgstr "Vragenlijst"
-
#: classes/Gems/Default/ProjectSurveysAction.php:68
#: classes/Gems/Default/SurveyAction.php:192
msgid "By"
@@ -1571,7 +1558,6 @@
#: classes/Gems/Default/ProjectTracksAction.php:85
#: classes/Gems/Default/TrackAction.php:451
-#: classes/Gems/Default/TrackMaintenanceAction.php:242
msgid "track"
msgid_plural "tracks"
msgstr[0] "traject"
@@ -1783,16 +1769,51 @@
msgid "Respondent planning"
msgstr "Per patiënt plannen"
-#: classes/Gems/Default/RoleAction.php:174
+#: classes/Gems/Default/RoleAction.php:58
+msgid "Access Control Lists"
+msgstr "Access Control Lists"
+
+#: classes/Gems/Default/RoleAction.php:59
+msgid "ACL's"
+msgstr "ACL's"
+
+#: classes/Gems/Default/RoleAction.php:168
+#: classes/Gems/Default/RoleAction.php:209
+msgid "Parents"
+msgstr "Afgeleid van"
+
+#: classes/Gems/Default/RoleAction.php:187
msgid "role"
msgid_plural "roles"
msgstr[0] "Rol"
msgstr[1] "Rollen"
-#: classes/Gems/Default/RoleAction.php:179
+#: classes/Gems/Default/RoleAction.php:192
msgid "Administrative roles"
msgstr "Beheer rollen en rechten"
+#: classes/Gems/Default/RoleAction.php:210
+#: classes/Gems/Default/RoleAction.php:226
+msgid "Allowed"
+msgstr "Toegestaan"
+
+#: classes/Gems/Default/RoleAction.php:211
+#: classes/Gems/Default/RoleAction.php:227
+msgid "Denied"
+msgstr "Geweigerd"
+
+#: classes/Gems/Default/RoleAction.php:215
+msgid "Project role overview"
+msgstr "Project rollen"
+
+#: classes/Gems/Default/RoleAction.php:225
+msgid "Privilege"
+msgstr "Privilége"
+
+#: classes/Gems/Default/RoleAction.php:231
+msgid "Project privileges"
+msgstr "Project priviléges"
+
#: classes/Gems/Default/SourceAction.php:69
msgid "Leave empty for the Gems database."
msgstr "Leeglaten bij gebruik van de Gems database."
@@ -1840,10 +1861,6 @@
msgstr[0] "bron"
msgstr[1] "bronnen"
-#: classes/Gems/Default/SourceAction.php:194
-msgid "Lime Survey Sources"
-msgstr "Lime Survey Bronnen"
-
#: classes/Gems/Default/SourceAction.php:202
msgid "This installation is active."
msgstr "Deze installatie is actief"
@@ -1882,15 +1899,11 @@
msgid "You are not allowed to edit this staff member."
msgstr "U mag deze medewerker niet wijzigen."
-#: classes/Gems/Default/StaffAction.php:182
-msgid "Organization"
-msgstr "Organisatie"
-
-#: classes/Gems/Default/StaffAction.php:186
+#: classes/Gems/Default/StaffAction.php:188
msgid "Primary function"
msgstr "Primaire functie"
-#: classes/Gems/Default/StaffAction.php:233
+#: classes/Gems/Default/StaffAction.php:240
msgid "staff member"
msgid_plural "staff members"
msgstr[0] "medewerker"
@@ -2269,12 +2282,10 @@
msgstr "Vrije tekst"
#: classes/Gems/Default/TrackFieldsAction.php:114
-#: classes/Gems/Default/TrackMaintenanceAction.php:211
msgid "Values"
msgstr "Waarden"
#: classes/Gems/Default/TrackFieldsAction.php:116
-#: classes/Gems/Default/TrackMaintenanceAction.php:213
msgid "Required"
msgstr "Verplicht"
@@ -2314,6 +2325,10 @@
msgstr "%s in traject"
#: classes/Gems/Default/TrackRoundAction.php:89
+#: classes/Gems/Default/TrackRoundsAction.php:82
+#: classes/Gems/Default/TrackRoundsAction.php:109
+#: classes/Gems/Default/TrackRoundsAction.php:144
+#: classes/Gems/Default/TrackRoundsAction.php:173
msgid "Missing track identifier."
msgstr "Ontbrekende traject identificatie."
@@ -2442,12 +2457,12 @@
msgstr "Contactdatum"
#: classes/Gems/Email/OneMailForm.php:131
-#: classes/Gems/Email/TemplateMailer.php:256
+#: classes/Gems/Email/TemplateMailer.php:211
msgid "The sending of emails was blocked for this installation."
msgstr "Het versturen van emails is geblokkeerd in deze installatie."
#: classes/Gems/Email/OneMailForm.php:139
-#: classes/Gems/Email/TemplateMailer.php:286
+#: classes/Gems/Email/TemplateMailer.php:244
msgid "Mail failed to send."
msgstr "Mail sturen mislukt."
@@ -2456,24 +2471,60 @@
msgid "Sent email to %s."
msgstr "Email naar %s verzonden."
-#: classes/Gems/Email/TemplateMailer.php:302
+#: classes/Gems/Email/TemplateMailer.php:260
#, php-format
msgid "Sent %d e-mails, updated %d tokens."
msgstr "%d emails verzonden en %d kenmerken bijgewerkt."
-#: classes/Gems/Menu/MenuAbstract.php:229
+#: classes/Gems/Export/Excel.php:60
+msgid "Excel options"
+msgstr "Excel opties"
+
+#: classes/Gems/Export/Excel.php:62
+msgid "Export questions instead of variable names"
+msgstr "Exporteer vragen in plaats van variabele namen"
+
+#: classes/Gems/Export/Excel.php:63
+msgid "Format answers"
+msgstr "Antwoorden opmaken"
+
+#: classes/Gems/Export/Spss.php:60
+msgid "Which file"
+msgstr "Kies bestand"
+
+#: classes/Gems/Export/Spss.php:61
+msgid "syntax"
+msgstr "syntax"
+
+#: classes/Gems/Export/Spss.php:62
+msgid "data"
+msgstr "data"
+
+#: classes/Gems/Export/Spss.php:67
+msgid "Some help for this export"
+msgstr "Uitleg over deze export mogelijkheid"
+
+#: classes/Gems/Menu/MenuAbstract.php:206
+msgid "Servers"
+msgstr "Servers"
+
+#: classes/Gems/Menu/MenuAbstract.php:210
+msgid "Templates"
+msgstr "Sjablonen"
+
+#: classes/Gems/Menu/MenuAbstract.php:243
msgid "By period"
msgstr "Per periode"
-#: classes/Gems/Menu/MenuAbstract.php:230
+#: classes/Gems/Menu/MenuAbstract.php:244
msgid "By token"
msgstr "Per kenmerk"
-#: classes/Gems/Menu/MenuAbstract.php:231
+#: classes/Gems/Menu/MenuAbstract.php:245
msgid "By respondent"
msgstr "Per patiënt"
-#: classes/Gems/Menu/MenuAbstract.php:235
+#: classes/Gems/Menu/MenuAbstract.php:249
msgid "Bulk mail"
msgstr "Bulk mail"
@@ -2845,11 +2896,13 @@
msgstr "Nieuwe ronde toevoegen"
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:124
+#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:164
#, php-format
msgid "Token %s not found."
msgstr "Kenmerk %s niet gevonden"
#: classes/Gems/Tracker/Snippets/EditTokenSnippetAbstract.php:128
+#: classes/Gems/Tracker/Snippets/ShowTokenSnippetAbstract.php:168
msgid "No token specified."
msgstr "Geen kenmerk opgegeven."
@@ -3325,6 +3378,7 @@
msgstr "Kenmerk %s voor vragenlijsten %s is verwijderd."
#: snippets/DeleteTrackTokenSnippet.php:269
+#: snippets/EditTrackTokenSnippet.php:174
#, php-format
msgid "%d token changed by recalculation."
msgid_plural "%d tokens changed by recalculation."
@@ -3442,9 +3496,16 @@
msgid "This track can be assigned since %s."
msgstr "Dit traject kan sinds %s aan een patiënt toegewezen worden."
-#~ msgid "The Pulse software was made possible thanks to support from "
-#~ msgstr "De PULSE software is mede mogelijk gemaakt met steun van "
+#: views/scripts/index/login.phtml:12
+msgid "The Pulse software was made possible thanks to support from "
+msgstr "De PULSE software is mede mogelijk gemaakt met steun van "
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Lime Survey Sources"
+#~ msgstr "Lime Survey Bronnen"
+
#~ msgid "Filling in by"
#~ msgstr "Invullen door"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-16 15:15:03
|
Revision: 32
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=32&view=rev
Author: matijsdejong
Date: 2011-09-16 15:14:56 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
- sorted function names TemplateMailer.php
- extended existing logging with template id & from address
Modified Paths:
--------------
trunk/library/classes/Gems/Email/EmailFormAbstract.php
trunk/library/classes/Gems/Email/TemplateMailer.php
trunk/library/classes/GemsEscort.php
trunk/library/configs/db/patches.sql
trunk/library/configs/db/tables/gems__respondent_communications.60.sql
Modified: trunk/library/classes/Gems/Email/EmailFormAbstract.php
===================================================================
--- trunk/library/classes/Gems/Email/EmailFormAbstract.php 2011-09-16 08:28:47 UTC (rev 31)
+++ trunk/library/classes/Gems/Email/EmailFormAbstract.php 2011-09-16 15:14:56 UTC (rev 32)
@@ -486,6 +486,7 @@
$this->mailer->setMethod($this->getValue('multi_method'));
$this->mailer->setSubject($this->getValue('gmt_subject'));
$this->mailer->setBody($this->getValue('gmt_body'));
+ $this->mailer->setTemplateId($this->getValue('select_subject'));
$result = $this->mailer->process($this->getTokensData());
Modified: trunk/library/classes/Gems/Email/TemplateMailer.php
===================================================================
--- trunk/library/classes/Gems/Email/TemplateMailer.php 2011-09-16 08:28:47 UTC (rev 31)
+++ trunk/library/classes/Gems/Email/TemplateMailer.php 2011-09-16 15:14:56 UTC (rev 32)
@@ -66,6 +66,7 @@
private $_subject = null;
private $_body = null;
private $_method = 'M';
+ private $_templateId = null; // Not used for lookup
private $_tokenData = array();
private $_verbose = false;
@@ -86,11 +87,45 @@
return $this;
}
+ /**
+ * Replaces fields with their values
+ * @param string $value
+ * @return string
+ */
+ public function applyFields($value)
+ {
+ if (! $this->_mailFields) {
+ $this->getTokenMailFields();
+ }
+ if (! $this->_mailKeys) {
+ $this->_mailKeys = array_keys($this->_mailFields);
+ }
+
+ return str_replace($this->_mailKeys, $this->_mailFields, $value);
+ }
+
+ /**
+ * Returns true if the "email.bounce" setting exists in the project
+ * configuration and is true
+ * @return boolean
+ */
+ public function bounceCheck()
+ {
+ return isset($this->escort->project->email['bounce']) && $this->escort->project->email['bounce'];
+ }
+
+ /**
+ * Returns Zend_Mail_Transport_Abstract when something else than the default mail protocol should be used.
+ *
+ * @staticvar array $mailServers
+ * @param email address $from
+ * @return Zend_Mail_Transport_Abstract or null
+ */
public function checkTransport($from)
{
static $mailServers = array();
- if (!array_key_exists($from, $mailServers)) {
+ if (! array_key_exists($from, $mailServers)) {
$sql = 'SELECT * FROM gems__mail_servers WHERE ? LIKE gms_from ORDER BY LENGTH(gms_from) DESC LIMIT 1';
// Always set cache, se we know when not to check for this row.
@@ -138,31 +173,13 @@
return $this->messages;
}
- /**
- * Returns true if the "email.bounce" setting exists in the project
- * configuration and is true
- * @return boolean
- */
- public function bounceCheck()
+ public function getTokenMailFields()
{
- return isset($this->escort->project->email['bounce']) && $this->escort->project->email['bounce'];
- }
-
- /**
- * Replaces fields with their values
- * @param string $value
- * @return string
- */
- public function applyFields($value)
- {
if (! $this->_mailFields) {
- $this->getTokenMailFields();
+ $this->_mailFields = $this->escort->tokenMailFields($this->_tokenData);
}
- if (! $this->_mailKeys) {
- $this->_mailKeys = array_keys($this->_mailFields);
- }
- return str_replace($this->_mailKeys, $this->_mailFields, $value);
+ return $this->_mailFields;
}
/**
@@ -184,68 +201,6 @@
}
/**
- * Sets verbose (noisy) operation
- * @param boolean $verbose
- */
- public function setVerbose($verbose)
- {
- $this->_verbose = $verbose;
- }
-
- /**
- * Sets sender (regular e-mail address) or one of:
- * 'O' - Uses the contact information of the selected organization
- * 'S' - Uses the site-wide contact information
- * 'U' - Uses the contact information of the currently logged in user
- *
- * @param string $from
- */
- public function setFrom($from)
- {
- $this->_from = $from;
- }
-
- /**
- * Sets a list of tokens
- * @param string[] $tokens
- */
- public function setTokens(array $tokens)
- {
- $this->_tokens = $tokens;
- }
-
- /**
- * Sets the sending method to use
- * 'M' - Send multiple mails per respondent, one for each checked token.
- * 'O' - Send one mail per respondent, mark all checked tokens as send.
- * 'A' - Send one mail per respondent, mark only mailed tokens as send.
- *
- * @param string $method
- */
- public function setMethod($method)
- {
- $this->_method = $method;
- }
-
- /**
- * Sets the subject of the mail
- * @param string $subject
- */
- public function setSubject($subject)
- {
- $this->_subject = $subject;
- }
-
- /**
- * Sets the body of the mail
- * @param string $body
- */
- public function setBody($body)
- {
- $this->_body = $body;
- }
-
- /**
* Processes an array of token data and sends e-mails
* @param array $tokensData
* @return boolean
@@ -279,7 +234,10 @@
$ucount = 0;
foreach ($tokensData as $tokenData) {
+ // Should this token be mailed?
if (in_array($tokenData['gto_id_token'], $this->_tokens)) {
+
+ // Should all tokens be mailed or is this the first?
if ($mailAll || (! isset($send[$tokenData['grs_email']]))) {
if ($message = $this->processMail($tokenData)) {
@@ -347,7 +305,7 @@
if ($message = $this->sendMail($to, $to_name, $from, $from_name, $tokenData)) {
return $message;
} else {
- $this->updateToken($tokenData);
+ $this->updateToken($tokenData, $to, $from);
return false;
}
}
@@ -395,59 +353,67 @@
try {
$mail->send($this->checkTransport($from));
- return false;
+ $result = false;
} catch (Exception $e) {
- return $e->getMessage();
+ $result = $e->getMessage();
+
+ // Log to error file
+ $this->escort->logger->logError($e, $this->escort->request);
}
+
+ return $result;
}
/**
- * Updates a token
- * @param array $tokenData
- * @param string $subject
+ * Sets the body of the mail
+ * @param string $body
*/
- protected function updateToken(array $tokenData, $subject = null)
+ public function setBody($body)
{
- if (null === $subject) {
- $subject = $this->_mailSubject;
- } else {
- $this->_mailSubject = $subject;
- }
+ $this->_body = $body;
+ }
- if (null === $this->_changeDate) {
- $this->_changeDate = new Zend_Db_Expr('CURRENT_TIMESTAMP');
- }
+ /**
+ * Sets sender (regular e-mail address) or one of:
+ * 'O' - Uses the contact information of the selected organization
+ * 'S' - Uses the site-wide contact information
+ * 'U' - Uses the contact information of the currently logged in user
+ *
+ * @param string $from
+ */
+ public function setFrom($from)
+ {
+ $this->_from = $from;
+ }
- $db = $this->escort->db;
- $uid = $this->escort->session->user_id;
+ /**
+ * Sets the sending method to use
+ * 'M' - Send multiple mails per respondent, one for each checked token.
+ * 'O' - Send one mail per respondent, mark all checked tokens as send.
+ * 'A' - Send one mail per respondent, mark only mailed tokens as send.
+ *
+ * @param string $method
+ */
+ public function setMethod($method)
+ {
+ $this->_method = $method;
+ }
- $tdata['gto_mail_sent_date'] = $this->_mailDate;
-
- $db->update('gems__tokens', $tdata, $db->quoteInto('gto_id_token = ?', $tokenData['gto_id_token']));
-
- $cdata['grco_id_to'] = $tokenData['grs_id_user'];
- $cdata['grco_id_by'] = $uid;
- $cdata['grco_organization'] = $tokenData['gor_id_organization'];
- $cdata['grco_id_token'] = $tokenData['gto_id_token'];
- $cdata['grco_method'] = 'email';
- $cdata['grco_topic'] = substr($subject, 0, 120);
- $cdata['grco_address'] = substr($tokenData['grs_email'], 0, 120);
- $cdata['grco_changed'] = $this->_changeDate;
- $cdata['grco_changed_by'] = $uid;
- $cdata['grco_created'] = $this->_changeDate;
- $cdata['grco_created_by'] = $uid;
-
- $db->insert('gems__respondent_communications', $cdata);
+ /**
+ * Sets the subject of the mail
+ * @param string $subject
+ */
+ public function setSubject($subject)
+ {
+ $this->_subject = $subject;
}
- public function getTokenMailFields()
+ public function setTemplateId($templatedId)
{
- if (! $this->_mailFields) {
- $this->_mailFields = $this->escort->tokenMailFields($this->_tokenData);
- }
+ $this->_templateId = $templatedId;
- return $this->_mailFields;
+ return $this;
}
public function setTokenData(array $tokenData)
@@ -470,4 +436,65 @@
return $this->_mailFields;
}
+
+ /**
+ * Sets a list of tokens
+ * @param string[] $tokens
+ */
+ public function setTokens(array $tokens)
+ {
+ $this->_tokens = $tokens;
+ }
+
+ /**
+ * Sets verbose (noisy) operation
+ *
+ * @param boolean $verbose
+ */
+ public function setVerbose($verbose)
+ {
+ $this->_verbose = $verbose;
+ }
+
+ /**
+ * Updates a token and log's the communication
+ *
+ * @param array $tokenData
+ * @param string $to Optional, if available the communication is logged.
+ * @param string $from Optional
+ */
+ protected function updateToken(array $tokenData, $to = null, $from = null)
+ {
+ if (null === $this->_changeDate) {
+ $this->_changeDate = new Zend_Db_Expr('CURRENT_TIMESTAMP');
+ }
+
+ $db = $this->escort->db;
+ $uid = $this->escort->getCurrentUserId();
+
+ $tdata['gto_mail_sent_date'] = $this->_mailDate;
+
+ $db->update('gems__tokens', $tdata, $db->quoteInto('gto_id_token = ?', $tokenData['gto_id_token']));
+
+ if ($to) {
+ $cdata['grco_id_to'] = $tokenData['grs_id_user'];
+ $cdata['grco_id_by'] = $uid;
+ $cdata['grco_organization'] = $tokenData['gor_id_organization'];
+ $cdata['grco_id_token'] = $tokenData['gto_id_token'];
+
+ $cdata['grco_method'] = 'email';
+ $cdata['grco_topic'] = substr($this->_mailSubject, 0, 120);
+ $cdata['grco_address'] = substr($to, 0, 120);
+ $cdata['grco_sender'] = substr($from, 0, 120);
+
+ $cdata['grco_id_message'] = $this->_templateId;
+
+ $cdata['grco_changed'] = $this->_changeDate;
+ $cdata['grco_changed_by'] = $uid;
+ $cdata['grco_created'] = $this->_changeDate;
+ $cdata['grco_created_by'] = $uid;
+
+ $db->insert('gems__respondent_communications', $cdata);
+ }
+ }
}
Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php 2011-09-16 08:28:47 UTC (rev 31)
+++ trunk/library/classes/GemsEscort.php 2011-09-16 15:14:56 UTC (rev 32)
@@ -1090,6 +1090,10 @@
return $allowedOrganizations;
}
+ /**
+ *
+ * @return int The current active organization id or 0 when not known
+ */
public function getCurrentOrganization()
{
if ($this instanceof Gems_Project_Organization_MultiOrganizationInterface) {
@@ -1100,9 +1104,26 @@
return $this->getRespondentOrganization();
}
- return $this->session->user_organization_id;
+ if (isset($this->session->user_organization_id)) {
+ return $this->session->user_organization_id;
+ } else {
+ return 0;
+ }
}
+ /**
+ *
+ * @return int The current user id or 0 when not known.
+ */
+ public function getCurrentUserId()
+ {
+ if (isset($this->session->user_id)) {
+ return $this->session->user_id;
+ } else {
+ return 0;
+ }
+ }
+
public function getDatabasePaths()
{
$path = APPLICATION_PATH . '/configs/db';
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2011-09-16 08:28:47 UTC (rev 31)
+++ trunk/library/configs/db/patches.sql 2011-09-16 15:14:56 UTC (rev 32)
@@ -190,3 +190,6 @@
-- PATCH: Organization codes
ALTER TABLE `gems__organizations` ADD gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' AFTER gor_name;
+-- PATCH: Extra log
+ALTER TABLE gems__respondent_communications ADD grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null AFTER grco_address;
+ALTER TABLE gems__respondent_communications ADD grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message) AFTER grco_comments;
Modified: trunk/library/configs/db/tables/gems__respondent_communications.60.sql
===================================================================
--- trunk/library/configs/db/tables/gems__respondent_communications.60.sql 2011-09-16 08:28:47 UTC (rev 31)
+++ trunk/library/configs/db/tables/gems__respondent_communications.60.sql 2011-09-16 15:14:56 UTC (rev 32)
@@ -11,8 +11,11 @@
grco_method varchar(12) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
grco_topic varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
grco_address varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+ grco_sender varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
grco_comments varchar(120) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null,
+ grco_id_message bigint unsigned null references gems__mail_templates (gmt_id_message),
+
grco_changed timestamp not null default current_timestamp,
grco_changed_by bigint unsigned not null,
grco_created timestamp not null,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-09-16 08:28:53
|
Revision: 31
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=31&view=rev
Author: mennodekker
Date: 2011-09-16 08:28:47 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
updated properties
Modified Paths:
--------------
trunk/library/classes/Gems/Export/Excel.php
trunk/library/classes/Gems/Export/ExportAbstract.php
trunk/library/classes/Gems/Export/ExportInterface.php
trunk/library/classes/Gems/Export/ExportModel.php
trunk/library/classes/Gems/Export/Spss.php
trunk/library/classes/Gems/Export.php
Property Changed:
----------------
trunk/library/classes/Gems/Export/Excel.php
trunk/library/classes/Gems/Export/ExportAbstract.php
trunk/library/classes/Gems/Export/ExportInterface.php
trunk/library/classes/Gems/Export/ExportModel.php
trunk/library/classes/Gems/Export/Spss.php
trunk/library/classes/Gems/Export.php
Modified: trunk/library/classes/Gems/Export/Excel.php
===================================================================
--- trunk/library/classes/Gems/Export/Excel.php 2011-09-16 08:25:43 UTC (rev 30)
+++ trunk/library/classes/Gems/Export/Excel.php 2011-09-16 08:28:47 UTC (rev 31)
@@ -31,7 +31,7 @@
* @subpackage Export
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Excel.php 140 2011-09-15 14:18:14Z 175780 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Export/Excel.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Export/ExportAbstract.php
===================================================================
--- trunk/library/classes/Gems/Export/ExportAbstract.php 2011-09-16 08:25:43 UTC (rev 30)
+++ trunk/library/classes/Gems/Export/ExportAbstract.php 2011-09-16 08:28:47 UTC (rev 31)
@@ -31,7 +31,7 @@
* @subpackage Export
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: ExportAbstract.php 128 2011-08-12 12:33:14Z 175780 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Export/ExportAbstract.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Export/ExportInterface.php
===================================================================
--- trunk/library/classes/Gems/Export/ExportInterface.php 2011-09-16 08:25:43 UTC (rev 30)
+++ trunk/library/classes/Gems/Export/ExportInterface.php 2011-09-16 08:28:47 UTC (rev 31)
@@ -29,7 +29,7 @@
* @subpackage Export
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: ExportInterface.php 128 2011-08-12 12:33:14Z 175780 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Export/ExportInterface.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Export/ExportModel.php
===================================================================
--- trunk/library/classes/Gems/Export/ExportModel.php 2011-09-16 08:25:43 UTC (rev 30)
+++ trunk/library/classes/Gems/Export/ExportModel.php 2011-09-16 08:28:47 UTC (rev 31)
@@ -32,7 +32,7 @@
* @subpackage Export
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: ExportModel.php 138 2011-09-15 10:44:24Z 175780 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Export/ExportModel.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Export/Spss.php
===================================================================
--- trunk/library/classes/Gems/Export/Spss.php 2011-09-16 08:25:43 UTC (rev 30)
+++ trunk/library/classes/Gems/Export/Spss.php 2011-09-16 08:28:47 UTC (rev 31)
@@ -32,7 +32,7 @@
* @subpackage Export
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Spss.php 140 2011-09-15 14:18:14Z 175780 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Export/Spss.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
Modified: trunk/library/classes/Gems/Export.php
===================================================================
--- trunk/library/classes/Gems/Export.php 2011-09-16 08:25:43 UTC (rev 30)
+++ trunk/library/classes/Gems/Export.php 2011-09-16 08:28:47 UTC (rev 31)
@@ -31,7 +31,7 @@
* @subpackage Export
* @copyright Copyright (c) 2011 Erasmus MC
* @license New BSD License
- * @version $Id: Export.php 124 2011-08-09 11:56:35Z 175780 $
+ * @version $Id$
*/
/**
Property changes on: trunk/library/classes/Gems/Export.php
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision Date Author
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
