commit cb0b66497e435190a9d1dcefa6435b281a18ca8b
parent 56ca352bcf6891b8803e1b7c68de4c3aeb093a7f
Author: Jan Dankert <devnull@localhost>
Date: Sat, 19 Nov 2011 23:55:42 +0100
Layout der Masken für Sprache angepasst.
Diffstat:
5 files changed, 118 insertions(+), 21 deletions(-)
diff --git a/action/LanguageAction.class.php b/action/LanguageAction.class.php
@@ -92,7 +92,7 @@ class LanguageAction extends Action
/**
* Sprache hinzufuegen
*/
- function add()
+ function addView()
{
global $conf;
$countryList = $conf['countries'];
@@ -113,7 +113,7 @@ class LanguageAction extends Action
}
- function addlanguage()
+ function addAction()
{
global $conf;
$countryList = $conf['countries'];
@@ -143,7 +143,7 @@ class LanguageAction extends Action
/**
* Anzeigen der L�schbest�tigungs-Maske.
*/
- function remove()
+ function removeView()
{
$this->setTemplateVar('name' ,$this->language->name );
}
@@ -152,7 +152,7 @@ class LanguageAction extends Action
/**
* L�schen der Sprache.
*/
- function delete()
+ function removeAction()
{
if ( $this->getRequestVar('confirm') == '1' )
$this->language->delete();
@@ -162,6 +162,31 @@ class LanguageAction extends Action
/**
* Speichern der Sprache
*/
+ function advancedAction()
+ {
+ global $conf;
+
+ if ( $this->hasRequestVar('name') )
+ {
+ $this->language->name = $this->getRequestVar('name' );
+ $this->language->isoCode = $this->getRequestVar('isocode');
+ }
+ else
+ {
+ $countryList = $conf['countries'];
+ $iso = $this->getRequestVar('isocode');
+ $this->language->name = $countryList[$iso];
+ $this->language->isoCode = strtolower( $iso );
+ }
+
+ $this->language->save();
+ }
+
+
+
+ /**
+ * Speichern der Sprache
+ */
function editAction()
{
global $conf;
@@ -252,7 +277,7 @@ class LanguageAction extends Action
- function advanced()
+ function advancedView()
{
$this->setTemplateVar('isocode',$this->language->isoCode);
$this->setTemplateVar('name' ,$this->language->name );
diff --git a/themes/default/templates/language/add.tpl.src.xml b/themes/default/templates/language/add.tpl.src.xml
@@ -1,3 +1,13 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form method="post"><window icon="project" name="GLOBAL_PROJECTS"><row><cell><text text="LANGUAGE_ISOCODE"></text></cell><cell><selectbox list="isocodes" name="isocode"></selectbox></cell></row><row><cell class="act" colspan="2"><button type="ok"></button></cell></row></window></form></dummy></output>-
\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <form method="post">
+ <part class="line">
+ <part class="label">
+ <text text="LANGUAGE_ISOCODE"></text>
+ </part>
+ <part class="input">
+ <selectbox list="isocodes" name="isocode"></selectbox>
+ </part>
+ </part>
+ </form>
+</output>+
\ No newline at end of file
diff --git a/themes/default/templates/language/advanced.tpl.src.xml b/themes/default/templates/language/advanced.tpl.src.xml
@@ -1,3 +1,25 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form method="post"><window icon="group" name="GLOBAL_GROUPS"><row><cell><text text="GLOBAL_NAME"></text></cell><cell><input name="name"></input></cell></row><row><cell><text text="LANGUAGE_ISOCODE"></text></cell><cell><input name="isocode"></input></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="name"></focus></dummy></output>-
\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <header back="true"></header>
+ <form method="post">
+
+ <part class="line">
+ <part class="label">
+ <text text="GLOBAL_NAME"></text>
+ </part>
+ <part class="input">
+ <input name="name" class="focus"></input>
+ </part>
+ </part>
+
+
+ <part class="line">
+ <part class="label">
+ <text text="LANGUAGE_ISOCODE"></text>
+ </part>
+ <part class="input">
+ <input name="isocode"></input>
+ </part>
+ </part>
+ </form>
+</output>+
\ No newline at end of file
diff --git a/themes/default/templates/language/edit.tpl.src.xml b/themes/default/templates/language/edit.tpl.src.xml
@@ -1,3 +1,15 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form method="post"><window><row><cell><text text="GLOBAL_LANGUAGE"></text></cell><cell><selectbox list="isocodes" name="isocode"></selectbox></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="name"></focus></dummy></output>-
\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <header views="add,advanced,remove"></header>
+ <form method="post">
+
+ <part class="line">
+ <part class="label">
+ <text text="GLOBAL_LANGUAGE"></text>
+ </part>
+ <part class="input">
+ <selectbox list="isocodes" name="isocode"></selectbox>
+ </part>
+ </part>
+ </form>
+</output>+
\ No newline at end of file
diff --git a/themes/default/templates/language/remove.tpl.src.xml b/themes/default/templates/language/remove.tpl.src.xml
@@ -1,3 +1,31 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form method="post"><window icon="group" name="GLOBAL_GROUPS"><row><cell><text text="GLOBAL_NAME"></text></cell><cell><text var="name"></text></cell></row><row><cell colspan="2" class="help"><text text="GROUP_DELETE_DESC"></text></cell></row><row><cell colspan="2"><fieldset title="message:options"></fieldset></cell></row><row><cell colspan="2"><checkbox name="confirm"></checkbox><label for="confirm"><text text="CONFIRM_DELETE"></text></label></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="delete"></focus></dummy></output>-
\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <header back="true" />
+ <form method="post">
+ <fieldset>
+ <part class="line">
+ <part class="label">
+ <text text="GLOBAL_NAME"></text>
+ </part>
+ <part class="input">
+ <text var="name"></text>
+ </part>
+ </part>
+ </fieldset>
+
+ <fieldset title="message:options">
+
+ <part class="line">
+ <part class="label">
+ </part>
+ <part class="input">
+ <checkbox name="confirm"></checkbox>
+ <label for="confirm">
+ <text text="CONFIRM_DELETE"></text>
+ </label>
+ </part>
+ </part>
+ </fieldset>
+
+ </form>
+</output>+
\ No newline at end of file
