commit 34e5d15acb3a3a492e468c44bae30fa16b76623a
parent 97d99d403bd783e95cbc5184d729d3c3abf5a313
Author: Jan Dankert <devnull@localhost>
Date: Sun, 14 Oct 2012 18:07:41 +0200
Für die Action PageElement den Reiter \"Info\" korrigiert und \"Struktur\" neu angelegt.
Diffstat:
4 files changed, 131 insertions(+), 123 deletions(-)
diff --git a/action/PageelementAction.class.php b/action/PageelementAction.class.php
@@ -118,11 +118,6 @@ class PageelementAction extends Action
$this->setTemplateVar('elementid' ,$this->value->element->elementid);
$this->setTemplateVar('element_type',$this->value->element->type );
- if ( $this->value->element->type == 'longtext' && $this->value->element->wiki )
- {
- $this->setTemplateVar('text',$this->value->text);
- }
-
$user = new User( $this->value->lastchangeUserId );
$user->load();
$this->setTemplateVar('lastchange_user',$user);
@@ -141,6 +136,69 @@ class PageelementAction extends Action
/**
+ * Anzeigen des Element-Inhaltes.
+ */
+ public function infoView()
+ {
+ $language = Session::getProjectLanguage();
+ $this->value->languageid = $language->languageid;
+ $this->value->objectid = $this->page->objectid;
+ $this->value->pageid = $this->page->pageid;
+ $this->value->page = $this->page;
+ $this->value->simple = false;
+ $this->value->element = &$this->element;
+ $this->value->element->load();
+ $this->value->publish = false;
+ $this->value->load();
+
+ $this->setTemplateVar('name' ,$this->value->element->name );
+ $this->setTemplateVar('description' ,$this->value->element->desc );
+ $this->setTemplateVar('elementid' ,$this->value->element->elementid);
+ $this->setTemplateVar('element_type',$this->value->element->type );
+
+ $user = new User( $this->value->lastchangeUserId );
+ $user->load();
+ $this->setTemplateVar('lastchange_user',$user);
+ $this->setTemplateVar('lastchange_date',$this->value->lastchangeTimeStamp);
+
+ $t = new Template( $this->page->templateid );
+ $t->load();
+ $this->setTemplateVar('template_name',$t->name );
+ $this->setTemplateVar('template_id' ,$t->templateid );
+
+ $this->setTemplateVar('element_name' ,$this->value->element->name );
+ $this->setTemplateVar('element_id' ,$this->value->element->elementid );
+
+ }
+
+
+
+ /**
+ * Anzeigen des Element-Inhaltes.
+ */
+ public function structureView()
+ {
+ $language = Session::getProjectLanguage();
+ $this->value->languageid = $language->languageid;
+ $this->value->objectid = $this->page->objectid;
+ $this->value->pageid = $this->page->pageid;
+ $this->value->page = $this->page;
+ $this->value->simple = false;
+ $this->value->element = &$this->element;
+ $this->value->element->load();
+ $this->value->publish = false;
+ $this->value->load();
+
+ if ( $this->value->element->type == 'longtext' && $this->value->element->wiki )
+ {
+ $this->setTemplateVar('text',$this->value->text);
+ }
+
+ }
+
+
+
+ /**
* Normaler Editiermodus.
*
* Es wird ein Formular erzeugt, mit dem der Benutzer den Inhalt bearbeiten kann.
diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php
@@ -780,6 +780,17 @@ body > div
}
+/* Strukturen */
+div.structure ul
+{
+ padding-left:10px;
+ margin-left:10px;
+}
+div.structure em
+{
+ font-style: italic;
+}
+
diff --git a/themes/default/templates/pageelement/info.tpl.src.xml b/themes/default/templates/pageelement/info.tpl.src.xml
@@ -1,109 +1,60 @@
<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>
- <window icon="folder" widths="40%,60%">
- <row>
- <cell>
- <text text="name"></text>
- </cell>
- <cell class="name">
- <text var="name"></text>
- </cell>
- </row>
- <row>
- <cell>
- <text text="description"></text>
- </cell>
- <cell>
- <text var="description"></text>
- </cell>
- </row>
- <row>
- <cell>
- <text text="type"></text>
- </cell>
- <cell class="filename">
- <image elementtype="var:element_type"></image>
- <text key="el_{element_type}"></text>
- </cell>
- </row>
- <row>
- <cell colspan="2">
- <fieldset title="message:additional_info"></fieldset>
- </cell>
- </row>
- <row>
- <cell>
- <text key="template"></text>
- </cell>
- <cell>
- <if present="template_url">
- <link url="var:template_url" target="cms_main_main">
- <image file="icon_template"></image>
- <text var="template_name"></text>
- </link>
- </if>
- <if empty="template_url">
- <image file="icon_template"></image>
- <text var="template_name"></text>
- </if>
- </cell>
- </row>
- <row>
- <cell>
- <text key="element"></text>
- </cell>
- <cell>
- <if present="element_url">
- <link url="var:element_url" target="cms_main_main">
- <image elementtype="var:element_type"></image>
- <text var="element_name"></text>
- </link>
- </if>
- <if empty="element_url">
- <image icon="element"></image>
- <text var="element_name"></text>
- </if>
- </cell>
- </row>
- <if present="text">
- <row>
- <cell colspan="2">
- <fieldset title="message:DOCUMENT_TREE"></fieldset>
- </cell>
- </row>
- <row>
- <cell colspan="2">
- <editor type="dom" name="text"></editor>
- </cell>
- </row>
- </if>
- <row>
- <cell colspan="2">
- <fieldset title="message:prop_userinfo"></fieldset>
- </cell>
- </row>
- <row>
- <cell>
- <text text="lastchange"></text>
- </cell>
- <cell>
- <table>
- <row>
- <cell>
- <image icon="el_date"></image>
- <date date="var:lastchange_date"></date>
- </cell>
- <cell>
- <image icon="user"></image>
- <user user="var:lastchange_user"></user>
- </cell>
- </row>
- </table>
- </cell>
- </row>
- </window>
- </form>
- </dummy>
+ <table>
+ <row class="data">
+ <cell>
+ <text text="name"></text>
+ </cell>
+ <cell class="name">
+ <text var="name"></text>
+ </cell>
+ </row>
+ <row class="data">
+ <cell>
+ <text text="description"></text>
+ </cell>
+ <cell>
+ <text var="description"></text>
+ </cell>
+ </row>
+ <row class="data">
+ <cell>
+ <text text="type"></text>
+ </cell>
+ <cell class="filename">
+ <image elementtype="var:element_type"></image>
+ <text key="el_{element_type}"></text>
+ </cell>
+ </row>
+ <row class="data">
+ <cell>
+ <text key="template"></text>
+ </cell>
+ <cell id="var:template_id" name="var:template_name" action="template">
+ <image file="icon_template"></image>
+ <text var="template_name"></text>
+ </cell>
+ </row>
+ <row class="data">
+ <cell>
+ <text key="element"></text>
+ </cell>
+ <cell id="var:element_id" name="var:element_name" action="element">
+ <image type="var:element_type"></image>
+ <text var="element_name"></text>
+ </cell>
+ </row>
+ <row class="data">
+ <cell>
+ <text text="lastchange"></text>
+ </cell>
+ <cell>
+ <image icon="el_date"></image>
+ <date date="var:lastchange_date"></date>
+ <text raw=", "></text>
+ <image icon="user"></image>
+ <user user="var:lastchange_user"></user>
+ </cell>
+ </row>
+ </table>
</output>
\ No newline at end of file
diff --git a/themes/default/templates/pageelement/prop.tpl.src.xml b/themes/default/templates/pageelement/prop.tpl.src.xml
@@ -67,18 +67,6 @@
</if>
</cell>
</row>
- <if present="text">
- <row>
- <cell colspan="2">
- <fieldset title="message:DOCUMENT_TREE"></fieldset>
- </cell>
- </row>
- <row>
- <cell colspan="2">
- <editor type="dom" name="text"></editor>
- </cell>
- </row>
- </if>
<row>
<cell colspan="2">
<fieldset title="message:prop_userinfo"></fieldset>
