commit c12f80d2c12f2f9bd1c262c79a23c1a951829f2e
parent 4d48a9326536ac7b880f02310025fad566476bc9
Author: Jan Dankert <devnull@localhost>
Date: Wed, 24 Oct 2012 21:13:28 +0200
Fix: Neu-Knöpfe korrigiert.
Diffstat:
9 files changed, 145 insertions(+), 143 deletions(-)
diff --git a/action/LanguagelistAction.class.php b/action/LanguagelistAction.class.php
@@ -1,4 +1,4 @@
-O<?php
+<?php
// ---------------------------------------------------------------------------
// $Id$
// ---------------------------------------------------------------------------
diff --git a/action/TemplateAction.class.php b/action/TemplateAction.class.php
@@ -244,134 +244,6 @@ class TemplateAction extends Action
}
- /**
- * Vorlage hinzuf�gen.
- */
- function addView()
- {
- $this->setTemplateVar( 'templates',Template::getAll() );
-
- $examples = array();
- $dir = opendir( 'examples/templates');
- while( $file = readdir($dir) )
- {
- if ( substr($file,0,1) != '.')
- {
- $examples[$file] = $file;
- }
- }
-
- $this->setTemplateVar( 'examples',$examples );
- }
-
-
-
- function addPost()
- {
- // Hinzufuegen eines Templates
- if ( $this->getRequestVar('name') == '' )
- {
- $this->addValidationError('name');
- $this->callSubAction('add');
- return;
- }
-
- // Hinzufuegen eines Templates
- switch( $this->getRequestVar('type') )
- {
- case 'empty':
-
- $template = new Template();
- $template->add( $this->getRequestVar('name') );
- $this->addNotice('template',$template->name,'ADDED','ok');
- break;
-
- case 'copy':
-
- $copy_templateid = intval($this->getRequestVar('templateid') );
-
- if ( $copy_templateid == 0 )
- {
- $this->addValidationError('templateid');
- $this->callSubAction('add');
- return;
- }
-
- $template = new Template();
- $template->add( $this->getRequestVar('name') );
- $this->addNotice('template',$template->name,'ADDED','ok');
-
- $copy_template = new Template( $copy_templateid );
- $copy_template->load();
- foreach( $copy_template->getElements() as $element )
- {
- $element->load();
- $element->templateid = $template->templateid;
- $element->add();
- $element->save();
- }
-
- $this->addNotice('template',$copy_template->name,'COPIED','ok');
-
- break;
-
- case 'example':
-
- $template = new Template();
-
- $model = Session::getProjectModel();
- $template->modelid = $model->modelid;
-
- $template->add( $this->getRequestVar('name') );
-
- $example = parse_ini_file('examples/templates/'.$this->getRequestVar('example'),true);
-
- foreach( $example as $exampleKey=>$exampleElement )
- {
- if ( !is_array($exampleElement) )
- {
- $template->$exampleKey = $exampleElement;
- }
- else
- {
- $element = new Element();
- $element->templateid = $template->templateid;
- $element->name = $exampleKey;
- $element->writable = true;
- $element->add();
-
- foreach( $exampleElement as $ePropName=>$ePropValue)
- $element->$ePropName = $ePropValue;
-
- $element->defaultText = str_replace(';',"\n",$element->defaultText);
- $element->save();
-// Html::debug($element,"Element");
- }
- }
-// Html::debug($template,"Template");
- $template->name = $this->getRequestVar('name');
- $template->src = str_replace(';',"\n",$template->src);
-
- foreach( $template->getElementNames() as $elid=>$elname )
- {
- $template->src = str_replace('{{'.$elname.'}}' ,'{{'.$elid.'}}' ,$template->src );
- $template->src = str_replace('{{->'.$elname.'}}','{{->'.$elid.'}}',$template->src );
- }
-
- $template->save();
- $this->addNotice('template',$template->name,'ADDED','ok');
-
- break;
- default:
- $this->addValidationError('type');
- $this->callSubAction('add');
- return;
- }
-
-
- $this->setTemplateVar('tree_refresh',true);
- }
-
function propView()
{
diff --git a/action/TemplatelistAction.class.php b/action/TemplatelistAction.class.php
@@ -42,6 +42,7 @@ class TemplatelistAction extends Action
}
+
// Anzeigen aller Templates
//
function showView()
@@ -63,4 +64,134 @@ class TemplatelistAction extends Action
}
+
+ /**
+ * Vorlage hinzuf�gen.
+ */
+ function addView()
+ {
+ $this->setTemplateVar( 'templates',Template::getAll() );
+
+ $examples = array();
+ $dir = opendir( 'examples/templates');
+ while( $file = readdir($dir) )
+ {
+ if ( substr($file,0,1) != '.')
+ {
+ $examples[$file] = $file;
+ }
+ }
+
+ $this->setTemplateVar( 'examples',$examples );
+ }
+
+
+
+ function addPost()
+ {
+ // Hinzufuegen eines Templates
+ if ( $this->getRequestVar('name') == '' )
+ {
+ $this->addValidationError('name');
+ $this->callSubAction('add');
+ return;
+ }
+
+ // Hinzufuegen eines Templates
+ switch( $this->getRequestVar('type') )
+ {
+ case 'empty':
+
+ $template = new Template();
+ $template->add( $this->getRequestVar('name') );
+ $this->addNotice('template',$template->name,'ADDED','ok');
+ break;
+
+ case 'copy':
+
+ $copy_templateid = intval($this->getRequestVar('templateid') );
+
+ if ( $copy_templateid == 0 )
+ {
+ $this->addValidationError('templateid');
+ $this->callSubAction('add');
+ return;
+ }
+
+ $template = new Template();
+ $template->add( $this->getRequestVar('name') );
+ $this->addNotice('template',$template->name,'ADDED','ok');
+
+ $copy_template = new Template( $copy_templateid );
+ $copy_template->load();
+ foreach( $copy_template->getElements() as $element )
+ {
+ $element->load();
+ $element->templateid = $template->templateid;
+ $element->add();
+ $element->save();
+ }
+
+ $this->addNotice('template',$copy_template->name,'COPIED','ok');
+
+ break;
+
+ case 'example':
+
+ $template = new Template();
+
+ $model = Session::getProjectModel();
+ $template->modelid = $model->modelid;
+
+ $template->add( $this->getRequestVar('name') );
+
+ $example = parse_ini_file('examples/templates/'.$this->getRequestVar('example'),true);
+
+ foreach( $example as $exampleKey=>$exampleElement )
+ {
+ if ( !is_array($exampleElement) )
+ {
+ $template->$exampleKey = $exampleElement;
+ }
+ else
+ {
+ $element = new Element();
+ $element->templateid = $template->templateid;
+ $element->name = $exampleKey;
+ $element->writable = true;
+ $element->add();
+
+ foreach( $exampleElement as $ePropName=>$ePropValue)
+ $element->$ePropName = $ePropValue;
+
+ $element->defaultText = str_replace(';',"\n",$element->defaultText);
+ $element->save();
+// Html::debug($element,"Element");
+ }
+ }
+// Html::debug($template,"Template");
+ $template->name = $this->getRequestVar('name');
+ $template->src = str_replace(';',"\n",$template->src);
+
+ foreach( $template->getElementNames() as $elid=>$elname )
+ {
+ $template->src = str_replace('{{'.$elname.'}}' ,'{{'.$elid.'}}' ,$template->src );
+ $template->src = str_replace('{{->'.$elname.'}}','{{->'.$elid.'}}',$template->src );
+ }
+
+ $template->save();
+ $this->addNotice('template',$template->name,'ADDED','ok');
+
+ break;
+ default:
+ $this->addValidationError('type');
+ $this->callSubAction('add');
+ return;
+ }
+
+
+ $this->setTemplateVar('tree_refresh',true);
+ }
+
+
}
\ No newline at end of file
diff --git a/themes/default/templates/grouplist/show.tpl.src.xml b/themes/default/templates/grouplist/show.tpl.src.xml
@@ -15,7 +15,7 @@
</row>
</list>
<row class="data">
- <column colspan="2">
+ <column colspan="2" class="clickable">
<link type="view" subaction="add">
<image icon="add"/>
<text text="new"/>
diff --git a/themes/default/templates/languagelist/show.tpl.src.xml b/themes/default/templates/languagelist/show.tpl.src.xml
@@ -53,7 +53,7 @@
<set var="default_url"></set>
</list>
<row class="data">
- <column colspan="4">
+ <column colspan="4" class="clickable">
<link type="view" subaction="add">
<image icon="add"/>
<text text="new"/>
diff --git a/themes/default/templates/projectlist/show.tpl.src.xml b/themes/default/templates/projectlist/show.tpl.src.xml
@@ -17,7 +17,7 @@
</row>
</list>
<row class="data">
- <column>
+ <column class="clickable">
<link type="view" subaction="add">
<image icon="add" />
<text text="new" />
diff --git a/themes/default/templates/template/add.tpl.src.xml b/themes/default/templates/templatelist/add.tpl.src.xml
diff --git a/themes/default/templates/templatelist/show.tpl.src.xml b/themes/default/templates/templatelist/show.tpl.src.xml
@@ -13,20 +13,19 @@
</column>
</row>
</list>
-
+ <if empty="templates">
+ <row>
+ <text text="GLOBAL_NO_TEMPLATES_AVAILABLE_DESC"></text>
+ </row>
+ </if>
+
<row class="data">
- <column colspan="1">
+ <column colspan="1" class="clickable">
<link type="view" subaction="add">
- <image icon="add"/>
- <text text="new"/>
+ <image icon="add" />
+ <text text="new" />
</link>
</column>
</row>
</table>
- <if empty="templates">
- <text text="GLOBAL_NO_TEMPLATES_AVAILABLE_DESC"></text>
- </if>
- <link class="action" action="template" subaction="add">
- <text key="menu_template_add"></text>
- </link>
</output>
\ No newline at end of file
diff --git a/themes/default/templates/userlist/show.tpl.src.xml b/themes/default/templates/userlist/show.tpl.src.xml
@@ -35,7 +35,7 @@
</row>
</list>
<row class="data">
- <column colspan="3">
+ <column colspan="3" class="clickable">
<link type="view" subaction="add">
<image icon="add"/>
<text text="new"/>
