commit c584d528b9fae6142530ddd8630e9fa3ae6f885f
parent f0cabc070a0b7738185d70727ae78a42895b7018
Author: Jan Dankert <devnull@localhost>
Date: Sat, 21 Jul 2012 03:56:09 +0200
Anklickbare Tabellenzellen.
Diffstat:
13 files changed, 110 insertions(+), 65 deletions(-)
diff --git a/action/LanguageAction.class.php b/action/LanguageAction.class.php
@@ -94,7 +94,7 @@ class LanguageAction extends Action
* Diese Sprache wird benutzt beim Ausw?hlen des Projektes sowie
* als Default-Sprache bei mehrsprachigen Webseiten ("content-negotiation")
*/
- function setdefault()
+ function setdefaultPost()
{
$this->language->setDefault();
}
diff --git a/action/LanguagelistAction.class.php b/action/LanguagelistAction.class.php
@@ -1,4 +1,4 @@
-<?php
+O<?php
// ---------------------------------------------------------------------------
// $Id$
// ---------------------------------------------------------------------------
@@ -98,8 +98,7 @@ class LanguagelistAction extends Action
if ( $this->userIsAdmin() )
{
- $list[$id]['url' ] = Html::url('language','edit',$id,
- array() );
+ $list[$id]['id' ] = $id;
if ( ! $l->isDefault )
$list[$id]['default_url'] = Html::url( 'language','setdefault',$id );
diff --git a/action/ModelAction.class.php b/action/ModelAction.class.php
@@ -128,7 +128,7 @@ class ModelAction extends Action
}
- function setdefault()
+ function setdefaultPost()
{
if ( !$this->userIsAdmin() ) exit();
diff --git a/action/ModellistAction.class.php b/action/ModellistAction.class.php
@@ -53,8 +53,7 @@ class ModellistAction extends Action
$list[$id]['name'] = $m->name;
if ( $this->userIsAdmin() )
- $list[$id]['url' ] = Html::url('model','edit',$id,
- array() );
+ $list[$id]['id' ] = $id;
if ( ! $m->isDefault && $this->userIsAdmin() )
$list[$id]['default_url'] = Html::url('model','setdefault',$id);
diff --git a/action/StartAction.class.php b/action/StartAction.class.php
@@ -944,7 +944,7 @@ class StartAction extends Action
}
- function language()
+ function languagePost()
{
$user = Session::getUser();
if ( ! is_object($user) )
@@ -957,7 +957,7 @@ class StartAction extends Action
}
- function model()
+ function modelPost()
{
$user = Session::getUser();
if ( ! is_object($user) )
diff --git a/action/TemplateAction.class.php b/action/TemplateAction.class.php
@@ -513,7 +513,7 @@ class TemplateAction extends Action
$element->load();
$list[$elid] = array();
- $list[$elid]['url' ] = Html::url('element','name',$elid);
+ $list[$elid]['id' ] = $elid;
$list[$elid]['name'] = $element->name;
$list[$elid]['desc'] = $element->desc;
$list[$elid]['type'] = $element->type;
diff --git a/action/TemplatelistAction.class.php b/action/TemplatelistAction.class.php
@@ -52,7 +52,7 @@ class TemplatelistAction extends Action
{
$list[$id] = array();
$list[$id]['name'] = $name;
- $list[$id]['url' ] = Html::url('template','el',$id,array());
+ $list[$id]['id' ] = $id;
}
// $var['templatemodelid'] = htmlentities( $id );
diff --git a/themes/default/templates/folder/show.tpl.src.xml b/themes/default/templates/folder/show.tpl.src.xml
@@ -1,6 +1,5 @@
<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="create"></header>
<table>
<row class="headline">
<cell class="help">
@@ -42,11 +41,35 @@
</cell>
</row>
</if>
- <row>
- <cell>
- <link type="view" class="action" action="folder" subaction="create">
+ <row class="data">
+ <cell colspan="2">
+ <link type="view" action="folder" subaction="createfolder">
<image file="icon/create"></image>
- <text key="menu_folder_create"></text>
+ <text key="menu_folder_createfolder"></text>
+ </link>
+ </cell>
+ </row>
+ <row class="data">
+ <cell colspan="2">
+ <link type="view" action="folder" subaction="createpage">
+ <image file="icon/create"></image>
+ <text key="menu_folder_createpage"></text>
+ </link>
+ </cell>
+ </row>
+ <row class="data">
+ <cell colspan="2">
+ <link type="view" action="folder" subaction="createfile">
+ <image file="icon/create"></image>
+ <text key="menu_folder_createfile"></text>
+ </link>
+ </cell>
+ </row>
+ <row class="data">
+ <cell colspan="2">
+ <link type="view" action="folder" subaction="createlink">
+ <image file="icon/create"></image>
+ <text key="menu_folder_createlink"></text>
</link>
</cell>
</row>
diff --git a/themes/default/templates/language/edit.tpl.src.xml b/themes/default/templates/language/edit.tpl.src.xml
@@ -1,6 +1,6 @@
<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>
+ <header views="advanced,remove"></header>
<form method="post">
<part class="line">
diff --git a/themes/default/templates/languagelist/show.tpl.src.xml b/themes/default/templates/languagelist/show.tpl.src.xml
@@ -1,6 +1,5 @@
<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"></header>
<table>
<row class="headline">
<cell>
@@ -18,7 +17,7 @@
</row>
<list list="el" extract="true">
<row class="data">
- <cell url="var:url">
+ <cell id="var:id" name="var:name" action="language">
<image file="icon_language"></image>
<text var="name" maxlength="25"></text>
</cell>
@@ -26,8 +25,10 @@
<text var="isocode"></text>
</cell>
<if present="default_url">
- <cell url="var:default_url">
- <text text="GLOBAL_make_default"></text>
+ <cell>
+ <link type="post" action="language" subaction="setdefault" id="var:id">
+ <text text="GLOBAL_make_default"></text>
+ </link>
</cell>
</if>
<else>
@@ -36,8 +37,10 @@
</cell>
</else>
<if present="select_url">
- <cell url="var:select_url">
- <text text="GLOBAL_select"></text>
+ <cell>
+ <link type="post" action="start" subaction="language" id="var:id">
+ <text text="GLOBAL_select"></text>
+ </link>
</cell>
</if>
<else>
@@ -49,5 +52,13 @@
<set var="select_url"></set>
<set var="default_url"></set>
</list>
+ <row class="data">
+ <cell colspan="4">
+ <link type="view" subaction="add">
+ <image icon="add"/>
+ <text text="new"/>
+ </link>
+ </cell>
+ </row>
</table>
</output>
\ No newline at end of file
diff --git a/themes/default/templates/modellist/show.tpl.src.xml b/themes/default/templates/modellist/show.tpl.src.xml
@@ -1,6 +1,5 @@
<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"></header>
<table>
<row class="headline">
<cell>
@@ -15,16 +14,16 @@
</row>
<list list="el" extract="true">
<row class="data">
- <cell url="var:url">
- <link target="cms_main">
+ <cell id="var:id" name="var:name" action="model">
<image file="icon_model"></image>
<text var="name" maxlength="25"></text>
- </link>
</cell>
<if present="default_url">
- <cell url="var:default_url">
- <text text="GLOBAL_make_default"></text>
+ <cell>
+ <link type="post" action="model" subaction="setdefault" id="var:id">
+ <text text="GLOBAL_make_default"></text>
+ </link>
</cell>
</if>
<else>
@@ -35,8 +34,10 @@
<if present="select_url">
- <cell url="var:select_url">
- <text text="GLOBAL_select"></text>
+ <cell>
+ <link type="post" action="start" subaction="model" id="var:id">
+ <text text="GLOBAL_select"></text>
+ </link>
</cell>
</if>
<else>
@@ -48,5 +49,13 @@
<set var="select_url"></set>
<set var="default_url"></set>
</list>
+ <row class="data">
+ <cell colspan="3">
+ <link type="view" subaction="add">
+ <image icon="add"/>
+ <text text="new"/>
+ </link>
+ </cell>
+ </row>
</table>
</output>
\ No newline at end of file
diff --git a/themes/default/templates/template/el.tpl.src.xml b/themes/default/templates/template/el.tpl.src.xml
@@ -1,6 +1,5 @@
<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>
<table>
<row class="headline">
<cell>
@@ -12,7 +11,7 @@
</row>
<list list="el" extract="true">
<row class="data">
- <cell url="var:url">
+ <cell id="var:id" name="var:name" action="element">
<image elementtype="var:type"></image>
<text var="name"></text>
</cell>
@@ -21,13 +20,6 @@
</cell>
</row>
</list>
- <row>
- <cell class="data">
- <link class="action" action="template" subaction="addel">
- <text key="menu_template_addel"></text>
- </link>
- </cell>
- </row>
<if empty="el">
<row>
<cell colspan="2">
@@ -35,5 +27,13 @@
</cell>
</row>
</if>
+ <row class="data">
+ <cell colspan="2">
+ <link type="view" subaction="addel">
+ <image icon="add"/>
+ <text key="menu_template_addel"></text>
+ </link>
+ </cell>
+ </row>
</table>
</output>
\ No newline at end of file
diff --git a/themes/default/templates/templatelist/show.tpl.src.xml b/themes/default/templates/templatelist/show.tpl.src.xml
@@ -1,28 +1,32 @@
<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"></header>
- <dummy>
- <window name="GLOBAL_TEMPLATES">
- <table>
- <row class="headline">
- <cell>
- <text key="name"></text>
- </cell>
- </row>
- <list list="templates" extract="true">
- <row class="data">
- <cell url="var:url">
- <text var="name"></text>
- </cell>
- </row>
- </list>
- </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>
- </window>
- </dummy>
+ <table>
+ <row class="headline">
+ <cell>
+ <text key="name"></text>
+ </cell>
+ </row>
+ <list list="templates" extract="true">
+ <row class="data">
+ <cell id="var:id" name="var:name" action="template">
+ <text var="name"></text>
+ </cell>
+ </row>
+ </list>
+
+ <row class="data">
+ <cell colspan="1">
+ <link type="view" subaction="add">
+ <image icon="add"/>
+ <text text="new"/>
+ </link>
+ </cell>
+ </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
