summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-07 13:34:41 +0200
committerBjörn Geiger2011-09-07 13:34:41 +0200
commit4619d1e00733c3a08cbef39fb1910ef3c6f99641 (patch)
treec37d411b2fbf631a7077a343ebc45842eab4ffa6
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-4619d1e00733c3a08cbef39fb1910ef3c6f99641.tar.gz
poolctrl-4619d1e00733c3a08cbef39fb1910ef3c6f99641.tar.xz
poolctrl-4619d1e00733c3a08cbef39fb1910ef3c6f99641.zip
minor
-rw-r--r--application/forms/EventAdd.php26
-rw-r--r--application/forms/EventEdit.php13
-rw-r--r--public/media/js/script.js22
3 files changed, 40 insertions, 21 deletions
diff --git a/application/forms/EventAdd.php b/application/forms/EventAdd.php
index ccc1d87..2bbded4 100644
--- a/application/forms/EventAdd.php
+++ b/application/forms/EventAdd.php
@@ -49,6 +49,19 @@ class Application_Form_EventAdd extends Zend_Form
$this->setName('EventAdd');
$this->setMethod('post');
+ $eventcategoryfield = $this->createElement('select','category');
+ $eventcategoryfield ->setLabel('Category:');
+
+ if(count($this->eventcategorylist)>0){
+ foreach($this->eventcategorylist as $category => $c){
+ $eventcategoryfield->addMultiOption($c->getID(), $c->getTitle());
+ }
+ }
+
+ $eventcategoryfield->setRegisterInArrayValidator(false);
+ $eventcategoryfield->setAttrib('onchange', "eventcategoryfieldChanged('category');");
+ $this->addElement($eventcategoryfield);
+
$this->addElement('text', 'title', array(
'filters' => array('StringTrim'),
'validators' => array(
@@ -107,19 +120,6 @@ class Application_Form_EventAdd extends Zend_Form
'label' => 'Participants:',
));
- $eventcategoryfield = $this->createElement('select','category');
- $eventcategoryfield ->setLabel('Category:');
-
- if(count($this->eventcategorylist)>0){
- foreach($this->eventcategorylist as $category => $c){
- $eventcategoryfield->addMultiOption($c->getID(), $c->getTitle());
- }
- }
-
- $eventcategoryfield->setRegisterInArrayValidator(false);
- $eventcategoryfield->setAttrib('onchange', "eventcategoryfieldChanged('category');");
- $this->addElement($eventcategoryfield);
-
$this->addElement('text', 'note', array(
'filters' => array('StringTrim'),
'validators' => array(
diff --git a/application/forms/EventEdit.php b/application/forms/EventEdit.php
index 2a93a31..78c4a5c 100644
--- a/application/forms/EventEdit.php
+++ b/application/forms/EventEdit.php
@@ -59,6 +59,19 @@ class Application_Form_EventEdit extends Zend_Form
{
$this->setName('EventEdit');
$this->setMethod('post');
+
+ $eventcategoryfield = $this->createElement('select','category');
+ $eventcategoryfield ->setLabel('Category:');
+
+ if(count($this->eventcategorylist)>0){
+ foreach($this->eventcategorylist as $category => $c){
+ $eventcategoryfield->addMultiOption($c->getID(), $c->getTitle());
+ }
+ }
+
+ $eventcategoryfield->setRegisterInArrayValidator(false);
+ $eventcategoryfield->setAttrib('onchange', "eventcategoryfieldChanged('category');");
+ $this->addElement($eventcategoryfield);
$this->addElement('text', 'title', array(
'filters' => array('StringTrim'),
diff --git a/public/media/js/script.js b/public/media/js/script.js
index 324255d..a876f2f 100644
--- a/public/media/js/script.js
+++ b/public/media/js/script.js
@@ -92,29 +92,32 @@ function eventcategoryfieldChanged(name) {
}
}
label = option.label;
- endLabel = document.getElementById('end-label');
- endElement = document.getElementById('end-element');
startLabel = document.getElementById('start-label');
repeat = document.getElementById('repeat');
if (label == 'Boot' || label == 'Shutdown') {
- endLabel.style.display = "none";
- endElement.style.display = "none";
+ setInvisible("end-label");
+ setInvisible("end-element");
+ document.getElementById('end').disabled = true;
startLabel.firstChild.firstChild.nodeValue = startLabel.firstChild.firstChild.nodeValue
.replace(/Start/g, "Date");
repeat.checked = false;
} else if (label == 'Lecture') {
- endLabel.style.display = "";
- endElement.style.display = "";
+ setVisible("end-label");
+ setVisible("end-element");
+ document.getElementById('end').disabled = false;
startLabel.firstChild.firstChild.nodeValue = startLabel.firstChild.firstChild.nodeValue
.replace(/Date/g, "Start");
repeat.checked = true;
+
} else {
- endLabel.style.display = "";
- endElement.style.display = "";
+ setVisible("end-label");
+ setVisible("end-element");
+ document.getElementById('end').disabled = false;
startLabel.firstChild.firstChild.nodeValue = startLabel.firstChild.firstChild.nodeValue
.replace(/Date/g, "Start");
repeat.checked = false;
}
+ changeRepeatEnd('repeat');
}
function changeRepeatEnd(name) {
@@ -123,8 +126,11 @@ function changeRepeatEnd(name) {
if (checked) {
setVisible("repeatEnd-label");
setVisible("repeatEnd-element");
+ document.getElementById('repeatEnd').disabled = false;
+ disabled
} else {
setInvisible("repeatEnd-label");
setInvisible("repeatEnd-element");
+ document.getElementById('repeatEnd').disabled = true;
}
} \ No newline at end of file