commit 75a733ea6244a12b1f1581959bc2ec87e6293ddd parent 4e68ebe628b0ec4a2d96d1b1a875ee843cd68071 Author: Jan Dankert <devnull@localhost> Date: Mon, 15 Oct 2012 02:13:50 +0200 Merge mit Version vom PC. Diffstat:
148 files changed, 1743 insertions(+), 1063 deletions(-)
diff --git a/action/FileAction.class.php b/action/FileAction.class.php @@ -114,9 +114,9 @@ class FileAction extends ObjectAction * Anzeigen des Inhaltes, der Inhalt wird samt Header direkt * auf die Standardausgabe geschrieben */ - function showView() + function previewView() { - $this->setTemplateVar('preview_url',Html::url('file','preview',$this->file->objectid,array('target'=>'none') ) ); + $this->setTemplateVar('preview_url',Html::url('file','show',$this->file->objectid,array('target'=>'none') ) ); } @@ -124,7 +124,7 @@ class FileAction extends ObjectAction * Anzeigen des Inhaltes, der Inhalt wird samt Header direkt * auf die Standardausgabe geschrieben */ - function previewView() + function showView() { $this->lastModified( $this->file->lastchangeDate ); @@ -753,6 +753,64 @@ class FileAction extends ObjectAction return true; } } + + + + /** + * Liefert die Struktur zu diesem Ordner: + * - Mit den übergeordneten Ordnern und + * - den in diesem Ordner enthaltenen Objekten + * + * Beispiel: + * <pre> + * - A + * - B + * - C (dieser Ordner) + * - Unterordner + * - Seite + * - Seite + * - Datei + * </pre> + */ + public function structureView() + { + + $structure = array(); + $tmp = &$structure; + $nr = 0; + + $folder = new Folder( $this->file->parentid ); + $parents = $folder->parentObjectNames(false,true); + + foreach( $parents as $id=>$name) + { + unset($children); + unset($o); + $children = array(); + $o = array('id'=>$id,'name'=>$name,'type'=>'folder','level'=>++$nr,'children'=>&$children); + + $tmp[$id] = &$o;; + + unset($tmp); + + $tmp = &$children; + } + + + + unset($children); + unset($id); + unset($name); + + $elementChildren = array(); + + $tmp[ $this->file->objectid ] = array('id'=>$this->file->objectid,'name'=>$this->file->name,'type'=>'file','self'=>true,'children'=>&$elementChildren); + + + //Html::debug($structure); + + $this->setTemplateVar('outline',$structure); + } } ?> \ No newline at end of file diff --git a/action/FileAction.ini.php b/action/FileAction.ini.php @@ -2,10 +2,9 @@ [default] goto=show -[show] -menu=edit - [preview] + +[show] direct=true [edit] diff --git a/action/FolderAction.class.php b/action/FolderAction.class.php @@ -967,12 +967,82 @@ class FolderAction extends ObjectAction $this->addNotice('folder',$this->folder->name,'NO_TEMPLATES_AVAILABLE',OR_NOTICE_WARN); } + + /** + * Anzeigen des Inhaltes, der Inhalt wird samt Header direkt + * auf die Standardausgabe geschrieben + */ + private function previewViewUnused() + { + $this->setTemplateVar('preview_url',Html::url('folder','show',$this->folder->objectid,array('target'=>'none') ) ); + } + + + + /** + * Anzeige aller Objekte in diesem Ordner. + * @return unknown_type + */ + public function previewView() + { + global $conf_php; + + if ( ! $this->folder->isRoot ) + $this->setTemplateVar('up_url',Html::url('folder','show',$this->folder->parentid)); + + $list = array(); + + // Schleife ueber alle Objekte in diesem Ordner + foreach( $this->folder->getObjects() as $o ) + { + $id = $o->objectid; + + if ( $o->hasRight(ACL_READ) ) + { + $list[$id]['name'] = Text::maxLaenge( 30,$o->name ); + $list[$id]['filename'] = Text::maxLaenge( 20,$o->filename ); + $list[$id]['desc'] = Text::maxLaenge( 30,$o->desc ); + if ( $list[$id]['desc'] == '' ) + $list[$id]['desc'] = lang('NO_DESCRIPTION_AVAILABLE'); + $list[$id]['desc'] = $list[$id]['desc'].' - '.lang('IMAGE').' '.$id; + + $list[$id]['type'] = $o->getType(); + $list[$id]['id' ] = $id; + + $list[$id]['icon' ] = $o->getType(); + $list[$id]['class'] = $o->getType(); + $list[$id]['url' ] = Html::url($o->getType(),'',$id); + + if ( $o->getType() == 'file' ) + { + $file = new File( $id ); + $file->load(); + $list[$id]['desc'] .= ' - '.intval($file->size/1000).'kB'; + + if ( $file->isImage() ) + { + $list[$id]['icon' ] = 'image'; + $list[$id]['class'] = 'image'; + //$list[$id]['url' ] = Html::url('file','show',$id) nur sinnvoll bei Lightbox-Anzeige + } +// if ( substr($file->mimeType(),0,5) == 'text/' ) +// $list[$id]['icon'] = 'text'; + } + + $list[$id]['date'] = $o->lastchangeDate; + $list[$id]['user'] = $o->lastchangeUser; + } + } + + $this->setTemplateVar('object' ,$list ); + } + /** * Anzeige aller Objekte in diesem Ordner. * @return unknown_type */ - function showView() + function contentView() { global $conf_php; @@ -1196,6 +1266,71 @@ class FolderAction extends ObjectAction } + + /** + * Liefert die Struktur zu diesem Ordner: + * - Mit den übergeordneten Ordnern und + * - den in diesem Ordner enthaltenen Objekten + * + * Beispiel: + * <pre> + * - A + * - B + * - C (dieser Ordner) + * - Unterordner + * - Seite + * - Seite + * - Datei + * </pre> + */ + public function structureView() + { + + $structure = array(); + $tmp = &$structure; + $nr = 0; + + $parents = $this->folder->parentObjectNames(false,true); + + foreach( $parents as $id=>$name) + { + //Html::debug($name,"Name"); + + unset($children); + unset($o); + $children = array(); + $o = array('id'=>$id,'name'=>$name,'type'=>'folder','level'=>++$nr,'children'=>&$children); + + if ( $id == $this->folder->objectid) + $o['self'] = true; + + $tmp[$id] = &$o;; + + unset($tmp); + + $tmp = &$children; + } + + + $contents = $this->folder->getObjects(); + + unset($children); + unset($o); + + $children = array(); + foreach( $contents as $o ) + { + $children[$o->objectid] = array('id'=>$o->objectid,'name'=>$o->name,'type'=>$o->getType()); + } + $tmp+= $children; + + //Html::debug($structure); + + $this->setTemplateVar('outline',$structure); + } + + + function remove() { $this->setTemplateVars( $this->folder->getProperties() ); diff --git a/action/LanguageAction.class.php b/action/LanguageAction.class.php @@ -274,4 +274,36 @@ class LanguageAction extends Action return true; } } + + + /** + * Liefert die Struktur zu diesem Ordner: + * - Mit den übergeordneten Ordnern und + * - den in diesem Ordner enthaltenen Objekten + * + * Beispiel: + * <pre> + * - A + * - B + * - C (dieser Ordner) + * - Unterordner + * - Seite + * - Seite + * - Datei + * </pre> + */ + public function structureView() + { + $structure = array(); + $languagelistChildren = array(); + + $structure[0] = array('id'=>'0','name'=>lang('LANGUAGES'),'type'=>'languagelist','level'=>1,'children'=>&$languagelistChildren); + + $languagelistChildren[ $this->language->languageid ] = array('id'=>$this->language->languageid,'name'=>$this->language->name,'type'=>'language','self'=>true); + + + //Html::debug($structure); + + $this->setTemplateVar('outline',$structure); + } } \ No newline at end of file diff --git a/action/LinkAction.class.php b/action/LinkAction.class.php @@ -200,4 +200,63 @@ class LinkAction extends ObjectAction { $this->setTemplateVars( $this->link->getProperties() ); } + + + /** + * Liefert die Struktur zu diesem Ordner: + * - Mit den übergeordneten Ordnern und + * - den in diesem Ordner enthaltenen Objekten + * + * Beispiel: + * <pre> + * - A + * - B + * - C (dieser Ordner) + * - Unterordner + * - Seite + * - Seite + * - Datei + * </pre> + */ + public function structureView() + { + + $structure = array(); + $tmp = &$structure; + $nr = 0; + + $folder = new Folder( $this->link->parentid ); + $parents = $folder->parentObjectNames(false,true); + + foreach( $parents as $id=>$name) + { + unset($children); + unset($o); + $children = array(); + $o = array('id'=>$id,'name'=>$name,'type'=>'folder','level'=>++$nr,'children'=>&$children); + + $tmp[$id] = &$o;; + + unset($tmp); + + $tmp = &$children; + } + + + + unset($children); + unset($id); + unset($name); + + $elementChildren = array(); + + $tmp[ $this->link->objectid ] = array('id'=>$this->link->objectid,'name'=>$this->link->name,'type'=>'link','self'=>true,'children'=>&$elementChildren); + + // + //$elementChildren[$id] = array('id'=>$this->page->objectid.'_'.$id,'name'=>$name,'type'=>'pageelement','children'=>array() ); + + //Html::debug($structure); + + $this->setTemplateVar('outline',$structure); + } } \ No newline at end of file diff --git a/action/ModelAction.class.php b/action/ModelAction.class.php @@ -201,4 +201,36 @@ class ModelAction extends Action return true; } } + + + /** + * Liefert die Struktur zu diesem Ordner: + * - Mit den übergeordneten Ordnern und + * - den in diesem Ordner enthaltenen Objekten + * + * Beispiel: + * <pre> + * - A + * - B + * - C (dieser Ordner) + * - Unterordner + * - Seite + * - Seite + * - Datei + * </pre> + */ + public function structureView() + { + $structure = array(); + $modellistChildren = array(); + + $structure[0] = array('id'=>'0','name'=>lang('MODELS'),'type'=>'modellist','level'=>1,'children'=>&$modellistChildren); + + $modellistChildren[ $this->model->modelid ] = array('id'=>$this->model->modelid,'name'=>$this->model->name,'type'=>'model','self'=>true); + + + //Html::debug($structure); + + $this->setTemplateVar('outline',$structure); + } } \ No newline at end of file diff --git a/action/PageAction.class.php b/action/PageAction.class.php @@ -623,15 +623,15 @@ class PageAction extends ObjectAction /** * Seite anzeigen */ - function showView() + function previewView() { - $this->setTemplateVar('preview_url',Html::url('page','preview',$this->page->objectid,array('target'=>'none') ) ); + $this->setTemplateVar('preview_url',Html::url('page','show',$this->page->objectid,array('target'=>'none') ) ); } /** * Seite anzeigen */ - function previewView() + function showView() { // Seite definieren $this->page->load(); @@ -838,6 +838,73 @@ class PageAction extends ObjectAction } } + + /** + * Liefert die Struktur zu diesem Ordner: + * - Mit den übergeordneten Ordnern und + * - den in diesem Ordner enthaltenen Objekten + * + * Beispiel: + * <pre> + * - A + * - B + * - C (dieser Ordner) + * - Unterordner + * - Seite + * - Seite + * - Datei + * </pre> + */ + public function structureView() + { + + $structure = array(); + $tmp = &$structure; + $nr = 0; + + $folder = new Folder( $this->page->parentid ); + $parents = $folder->parentObjectNames(false,true); + + foreach( $parents as $id=>$name) + { + unset($children); + unset($o); + $children = array(); + $o = array('id'=>$id,'name'=>$name,'type'=>'folder','level'=>++$nr,'children'=>&$children); + + $tmp[$id] = &$o;; + + unset($tmp); + + $tmp = &$children; + } + + + + unset($children); + unset($id); + unset($name); + + $elementChildren = array(); + + $tmp[ $this->page->objectid ] = array('id'=>$this->page->objectid,'name'=>$this->page->name,'type'=>'page','self'=>true,'children'=>&$elementChildren); + + $template = new Template( $this->page->templateid ); + $elements = $template->getElementNames(); + + foreach( $elements as $id=>$name ) + { + $elementChildren[$id] = array('id'=>$this->page->objectid.'_'.$id,'name'=>$name,'type'=>'pageelement','children'=>array() ); + } + + //Html::debug($structure); + + $this->setTemplateVar('outline',$structure); + } + + + + } ?> \ No newline at end of file diff --git a/action/PageAction.ini.php b/action/PageAction.ini.php @@ -10,10 +10,9 @@ goto=show ;target=prop [show] -menu=elements +direct=true [preview] -direct=true [edit] direct=true diff --git a/action/PageelementAction.class.php b/action/PageelementAction.class.php @@ -66,13 +66,13 @@ class PageelementAction extends Action $id = $this->getRequestVar('id'); $ids = explode('_',$id); if ( count($ids) > 1 ) - list($pageid,$elementid)= $ids; + list($pageid,$elementid)= $ids; else { $pageid = $this->getRequestId(); $elementid = $this->getRequestVar('elementid'); } - + if ( $pageid != 0 ) { $this->page = new Page( $pageid ); @@ -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. @@ -156,16 +214,16 @@ class PageelementAction extends Action $this->value->publish = false; if ( intval($this->value->valueid)!=0 ) - $this->value->loadWithId(); + $this->value->loadWithId(); else - $this->value->load(); + $this->value->load(); $this->setTemplateVar('name' ,$this->value->element->name ); $this->setTemplateVar('desc' ,$this->value->element->desc ); $this->setTemplateVar('elementid',$this->value->element->elementid); $this->setTemplateVar('type' ,$this->value->element->type ); $this->setTemplateVar('value_time',time() ); - + $this->value->page = new Page( $this->page->objectid ); $this->value->page->languageid = $this->value->languageid; @@ -189,6 +247,37 @@ class PageelementAction extends Action /** + * Vorschau. + */ + public function previewView() + { + $language = Session::getProjectLanguage(); + $this->value->languageid = $language->languageid; + $this->value->objectid = $this->page->objectid; + $this->value->pageid = $this->page->pageid; + $this->value->element = &$this->element; + $this->value->element->load(); + $this->value->publish = false; + $this->value->public = true; + $this->value->simple = true; + + if ( intval($this->value->valueid)!=0 ) + $this->value->loadWithId(); + else + $this->value->load(); + + + $this->value->page = new Page( $this->page->objectid ); + $this->value->page->languageid = $this->value->languageid; + $this->value->page->load(); + + $this->value->generate(); + $this->setTemplateVar('preview' ,$this->value->value ); + } + + + + /** * Datum bearbeiten. * */ @@ -199,8 +288,8 @@ class PageelementAction extends Action // Wenn Datum nicht vorhanden... if ( $date == 0 ) - // ... dann aktuelles Datum (gerundet auf 1 Minute) verwenden - $date = intval(time()/60)*60; + // ... dann aktuelles Datum (gerundet auf 1 Minute) verwenden + $date = intval(time()/60)*60; $this->setTemplateVar('ansidate',date( 'Y-m-d H:i:s',$date ) ); $this->setTemplateVar('date' ,$date); @@ -264,7 +353,7 @@ class PageelementAction extends Action do { $woche = array(); // Neue Woche - + for ( $i=0; $i<=6; $i++ ) // Alle Wochentage der Woche { $wday = ($i+$weekdayOffset)%7; @@ -347,7 +436,7 @@ class PageelementAction extends Action 'hour' =>$hour , 'minute'=>$minute, 'second'=>$second ) ) ); - + // $this->setTemplateVar('date' ,$date); @@ -387,14 +476,14 @@ class PageelementAction extends Action // Ermitteln, welche Objekttypen verlinkt werden d�rfen. $type = $this->value->element->subtype; - + if ( substr($type,0,5) == 'image' ) - $type = 'file'; + $type = 'file'; if ( !in_array($type,array('file','page','link')) ) - $types = array('file','page','link'); + $types = array('file','page','link'); else - $types = array($type); + $types = array($type); $objects = array(); @@ -402,7 +491,7 @@ class PageelementAction extends Action { $o = new Object( $id ); $o->load(); - + // if ( in_array( $o->getType(),$types )) // { $f = new Folder( $o->parentid ); @@ -412,61 +501,61 @@ class PageelementAction extends Action $objects[ $id ] .= implode( FILE_SEP,$f->parentObjectNames(false,true) ); $objects[ $id ] .= FILE_SEP.$o->name; // } - } + } - asort( $objects ); // Sortieren + asort( $objects ); // Sortieren - $this->setTemplateVar('objects' ,$objects); - $this->setTemplateVar('linkobjectid',$this->value->linkToObjectId); + $this->setTemplateVar('objects' ,$objects); + $this->setTemplateVar('linkobjectid',$this->value->linkToObjectId); - if ( $this->getSessionVar('pageaction') != '' ) - $this->setTemplateVar('old_pageaction',$this->getSessionVar('pageaction')); - else - $this->setTemplateVar('old_pageaction','show' ); - } + if ( $this->getSessionVar('pageaction') != '' ) + $this->setTemplateVar('old_pageaction',$this->getSessionVar('pageaction')); + else + $this->setTemplateVar('old_pageaction','show' ); + } - function linkView() - { - $language = Session::getProjectLanguage(); - $this->value->languageid = $language->languageid; - $this->value->objectid = $this->page->objectid; - $this->value->pageid = $this->page->pageid; - $this->value->element = &$this->element; - $this->value->element->load(); - $this->value->publish = false; - $this->value->load(); + function linkView() + { + $language = Session::getProjectLanguage(); + $this->value->languageid = $language->languageid; + $this->value->objectid = $this->page->objectid; + $this->value->pageid = $this->page->pageid; + $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('desc' ,$this->value->element->desc ); + $this->setTemplateVar('name' ,$this->value->element->name ); + $this->setTemplateVar('desc' ,$this->value->element->desc ); - // Ermitteln, welche Objekttypen verlinkt werden d�rfen. - if ( empty($this->value->element->subtype) ) - $types = array('page','file','link'); // Fallback: Alle erlauben :) - else - $types = explode(',',$this->value->element->subtype ); + // Ermitteln, welche Objekttypen verlinkt werden d�rfen. + if ( empty($this->value->element->subtype) ) + $types = array('page','file','link'); // Fallback: Alle erlauben :) + else + $types = explode(',',$this->value->element->subtype ); - $objects = array(); + $objects = array(); - $objects[ 0 ] = lang('LIST_ENTRY_EMPTY'); // Wert "nicht ausgewählt" + $objects[ 0 ] = lang('LIST_ENTRY_EMPTY'); // Wert "nicht ausgewählt" - $t = new Template( $this->page->templateid ); + $t = new Template( $this->page->templateid ); - foreach( $t->getDependentObjectIds() as $id ) - { - $o = new Object( $id ); - $o->load(); - - // if ( in_array( $o->getType(),$types )) - // { - $f = new Folder( $o->parentid ); - // $f->load(); + foreach( $t->getDependentObjectIds() as $id ) + { + $o = new Object( $id ); + $o->load(); + + // if ( in_array( $o->getType(),$types )) + // { + $f = new Folder( $o->parentid ); + // $f->load(); - $objects[ $id ] = lang( $o->getType() ).': '; - $objects[ $id ] .= implode( FILE_SEP,$f->parentObjectNames(false,true) ); - $objects[ $id ] .= FILE_SEP.$o->name; - // } + $objects[ $id ] = lang( $o->getType() ).': '; + $objects[ $id ] .= implode( FILE_SEP,$f->parentObjectNames(false,true) ); + $objects[ $id ] .= FILE_SEP.$o->name; + // } } asort( $objects ); // Sortieren @@ -515,9 +604,9 @@ class PageelementAction extends Action { $this->editinsert(); } - - - + + + /** * Einf�gen-Element. * @@ -528,16 +617,16 @@ class PageelementAction extends Action $objects = array(); //Änderung der möglichen Types $types = array('file','page','link'); - $objects[ 0 ] = lang('LIST_ENTRY_EMPTY'); // Wert "nicht ausgewählt" + $objects[ 0 ] = lang('LIST_ENTRY_EMPTY'); // Wert "nicht ausgewählt" //Auch Dateien dazu foreach( Folder::getAllObjectIds($types) as $id ) - { - $f = new Folder( $id ); - $f->load(); - - $objects[ $id ] = lang( $f->getType() ).': '; - $objects[ $id ] .= implode( ' » ',$f->parentObjectNames(false,true) ); - } + { + $f = new Folder( $id ); + $f->load(); + + $objects[ $id ] = lang( $f->getType() ).': '; + $objects[ $id ] .= implode( ' » ',$f->parentObjectNames(false,true) ); + } foreach( Folder::getAllFolders() as $id ) { @@ -583,16 +672,16 @@ class PageelementAction extends Action private function editlongtext() { if ($this->value->element->wiki) - $this->setTemplateVar( 'editor','wiki' ); + $this->setTemplateVar( 'editor','wiki' ); elseif ($this->value->element->html) - $this->setTemplateVar( 'editor','html' ); + $this->setTemplateVar( 'editor','html' ); else - $this->setTemplateVar( 'editor','text' ); + $this->setTemplateVar( 'editor','text' ); if ( !isset($this->templateVars['text'])) - // Möglicherweise ist die Ausgabevariable bereits gesetzt, wenn man bereits - // einen Text eingegeben hat (Vorschaufunktion). - $this->setTemplateVar( 'text',$this->linkifyOIDs( $this->value->text ) ); + // Möglicherweise ist die Ausgabevariable bereits gesetzt, wenn man bereits + // einen Text eingegeben hat (Vorschaufunktion). + $this->setTemplateVar( 'text',$this->linkifyOIDs( $this->value->text ) ); if (! $this->isEditMode() ) { @@ -604,19 +693,19 @@ class PageelementAction extends Action $this->setTemplateVar('old_pageaction',$this->getSessionVar('pageaction')); else $this->setTemplateVar('old_pageaction','show' ); - + if ( $this->element->wiki ) { $project = Session::getProject(); $languages = $project->getLanguages(); - + if ( count($languages) > 1 ) { $languages[$this->value->languageid] = $languages[$this->value->languageid].' *'; $this->setTemplateVar('languages',$languages); } - + if ( $this->hasRequestVar('otherlanguageid') ) { $lid = $this->getRequestVar('otherlanguageid'); @@ -630,11 +719,11 @@ class PageelementAction extends Action $this->setTemplateVar('languagename' ,$languages[$lid] ); $this->setTemplateVar('otherlanguageid',$lid ); } - + if ( !isset($this->templateVars['text'])) - // Möglicherweise ist die Ausgabevariable bereits gesetzt, wenn man bereits - // einen Text eingegeben hat (Vorschaufunktion). - $this->setTemplateVar( 'text',$this->value->text ); + // Möglicherweise ist die Ausgabevariable bereits gesetzt, wenn man bereits + // einen Text eingegeben hat (Vorschaufunktion). + $this->setTemplateVar( 'text',$this->value->text ); } } @@ -829,7 +918,7 @@ class PageelementAction extends Action if ( empty($type)) die('Error: No element type available.'); - + $funktionName = 'save'.$type; $this->$funktionName(); // Aufruf Methode "save<ElementTyp>()" @@ -888,9 +977,9 @@ class PageelementAction extends Action // - Recht vorhanden // - Freigabe gewuenscht if ( $value->page->hasRight( ACL_RELEASE ) && $this->hasRequestVar('release') ) - $value->publish = true; + $value->publish = true; else - $value->publish = false; + $value->publish = false; // Up-To-Date-Check $lastChangeTime = $value->getLastChangeTime(); @@ -955,16 +1044,16 @@ class PageelementAction extends Action if ( $this->hasRequestVar('linkobjectid') ) - $value->linkToObjectId = $this->getRequestVar('linkobjectid'); + $value->linkToObjectId = $this->getRequestVar('linkobjectid'); else - $value->text = $this->compactOIDs( $this->getRequestVar('text','raw') ); + $value->text = $this->compactOIDs( $this->getRequestVar('text','raw') ); // Vorschau anzeigen if ( $this->hasRequestVar('preview' ) || - $this->hasRequestVar('addmarkup') ) + $this->hasRequestVar('addmarkup') ) { $inputText = $this->getRequestVar('text','raw'); - + if ( $this->hasRequestVar('preview') ) { $value->page = $this->page; @@ -984,35 +1073,35 @@ class PageelementAction extends Action $addText = $this->getRequestVar('addtext','raw'); if ( $this->hasRequestVar('strong') ) - $inputText .= $conf_tags['strong-begin'].$addText.$conf_tags['strong-end']; + $inputText .= $conf_tags['strong-begin'].$addText.$conf_tags['strong-end']; if ( $this->hasRequestVar('emphatic') ) - $inputText .= $conf_tags['emphatic-begin'].$addText.$conf_tags['emphatic-end']; + $inputText .= $conf_tags['emphatic-begin'].$addText.$conf_tags['emphatic-end']; if ( $this->hasRequestVar('link') ) - $inputText .= '"'.$addText.'"'.$conf_tags['linkto'].'"'.$this->parseOID($this->getRequestVar('objectid')).'"'; + $inputText .= '"'.$addText.'"'.$conf_tags['linkto'].'"'.$this->parseOID($this->getRequestVar('objectid')).'"'; } if ( $this->hasRequestVar('table') ) - $inputText .= "\n". - $conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep']."\n". - $conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep']."\n". - $conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep']."\n"; + $inputText .= "\n". + $conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep']."\n". + $conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep']."\n". + $conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep'].' '.$addText.' '.$conf_tags['table-cell-sep']."\n"; if ( $this->hasRequestVar('list') ) - $inputText .= "\n". - $conf_tags['list-unnumbered'].' '.$addText."\n". - $conf_tags['list-unnumbered'].' '.$addText."\n". - $conf_tags['list-unnumbered'].' '.$addText."\n"; + $inputText .= "\n". + $conf_tags['list-unnumbered'].' '.$addText."\n". + $conf_tags['list-unnumbered'].' '.$addText."\n". + $conf_tags['list-unnumbered'].' '.$addText."\n"; if ( $this->hasRequestVar('numlist') ) - $inputText .= "\n". - $conf_tags['list-numbered'].' '.$addText."\n". - $conf_tags['list-numbered'].' '.$addText."\n". - $conf_tags['list-numbered'].' '.$addText."\n"; + $inputText .= "\n". + $conf_tags['list-numbered'].' '.$addText."\n". + $conf_tags['list-numbered'].' '.$addText."\n". + $conf_tags['list-numbered'].' '.$addText."\n"; if ( $this->hasRequestVar('image') ) - $inputText .= $conf_tags['image-begin'].$this->parseOID($this->getRequestVar('objectid')).$conf_tags['image-end']; + $inputText .= $conf_tags['image-begin'].$this->parseOID($this->getRequestVar('objectid')).$conf_tags['image-end']; } // Ermitteln aller verlinkbaren Objekte (fuer Editor) @@ -1021,16 +1110,16 @@ class PageelementAction extends Action foreach( Folder::getAllObjectIds() as $id ) { - $o = new Object( $id ); - $o->load(); + $o = new Object( $id ); + $o->load(); - if ( $o->getType() != 'folder' ) - { - $f = new Folder( $o->parentid ); - $objects[ $id ] = lang( 'GLOBAL_'.$o->getType() ).': '; - $objects[ $id ] .= implode( FILE_SEP,$f->parentObjectNames(false,true) ); - $objects[ $id ] .= FILE_SEP.$o->name; - } + if ( $o->getType() != 'folder' ) + { + $f = new Folder( $o->parentid ); + $objects[ $id ] = lang( 'GLOBAL_'.$o->getType() ).': '; + $objects[ $id ] .= implode( FILE_SEP,$f->parentObjectNames(false,true) ); + $objects[ $id ] .= FILE_SEP.$o->name; + } } asort($objects); $this->setTemplateVar( 'objects' ,$objects ); @@ -1166,9 +1255,9 @@ class PageelementAction extends Action { $this->saveinsert(); } - - + + /** * Element speichern * @@ -1260,7 +1349,7 @@ class PageelementAction extends Action switch($type) { case 'odf': - + // Angabe Content-Type // header('Content-Type: '.$this->file->mimeType()); // header('X-File-Id: '.$this->file->fileid); @@ -1316,11 +1405,11 @@ class PageelementAction extends Action case 'archive': // Archiv ist nur verf�gbar, wenn es mind. 1 Version des Inhaltes gibt. - + if ( $this->subActionName!='diff' && is_object($this->value) ) - return $this->value->getCountVersions() > 0; + return $this->value->getCountVersions() > 0; else - return true; + return true; case 'link': // Verkn�pfung zu anderen Seiten ist nur m�glich f�r @@ -1362,12 +1451,52 @@ class PageelementAction extends Action preg_match_all('/(.*)__OID__([0-9]+)__(.*)/', $text, $treffer,PREG_SET_ORDER); $oid = $treffer[0][2]; - + if ( !empty($oid) ) - return $oid; + return $oid; else - return intval($text); + return intval($text); } -} -?> + /** + * Seite veroeffentlichen + * + * Es wird ein Formular angzeigt, mit dem die Seite veroeffentlicht + * werden kann + */ + public function pubView() + { + } + + + + /** + * Seite veroeffentlichen + * + * Die Seite wird generiert. + */ + function pubPost() + { + if ( !$this->page->hasRight( ACL_PUBLISH ) ) + Http::notAuthorized( 'no right for publish' ); + + $this->page->public = true; + $this->page->publish(); + $this->page->publish->close(); + +// foreach( $this->page->publish->publishedObjects as $o ) +// { +// $this->addNotice($o['type'],$o['full_filename'],'PUBLISHED','ok'); +// } + + $this->addNotice( 'page', + $this->page->fullFilename, + 'PUBLISHED'.($this->page->publish->ok?'':'_ERROR'), + $this->page->publish->ok, + array(), + $this->page->publish->log ); + } + +} + +?>+ \ No newline at end of file diff --git a/action/TemplateAction.class.php b/action/TemplateAction.class.php @@ -411,6 +411,18 @@ class TemplateAction extends Action $this->setTemplateVar('type','text'); } + + + /** + * Anzeigen des Inhaltes, der Inhalt wird samt Header direkt + * auf die Standardausgabe geschrieben + */ + function previewView() + { + $this->setTemplateVar('preview_url',Html::url('template','show',$this->template->templateid,array('target'=>'none') ) ); + } + + /** diff --git a/config/config-default.php b/config/config-default.php @@ -816,8 +816,8 @@ $conf['style']['modern']['name']='Modern Style'; $conf['style']['modern']['title_background_color']='#3F6194'; $conf['style']['modern']['title_text_color']='white'; $conf['style']['modern']['text_color'] ='black'; -$conf['style']['modern']['background_color'] = '#FFF6E6'; -$conf['style']['modern']['inactive_background_color'] = '#FFE5B8'; +$conf['style']['modern']['background_color'] = '#EEEEEE'; +$conf['style']['modern']['inactive_background_color'] = '#7FB1E4'; $conf['theme'] = array(); $conf['theme']['compiler'] = array(); diff --git a/model/File.class.php b/model/File.class.php @@ -663,7 +663,7 @@ EOF if ( $this->tmpfile == '' ) { $db = db_connection(); - $this->tmpfile = $this->getTempDir().'openrat_db'.$db->id.'_'.$this->objectid.'.tmp'; + $this->tmpfile = $this->getTempFileName( array('db'=>$db->id,'o'.$this->objectid) ); } return $this->tmpfile; } diff --git a/model/Page.class.php b/model/Page.class.php @@ -257,11 +257,11 @@ class Page extends Object switch( $object->getType() ) { case 'file': - $inhalt = Html::url('file','preview',$objectid,$param); + $inhalt = Html::url('file','show',$objectid,$param); break; case 'page': - $inhalt = Html::url('page','preview',$objectid,$param); + $inhalt = Html::url('page','show',$objectid,$param); break; case 'link': @@ -276,11 +276,11 @@ class Page extends Object switch( $linkedObject->getType() ) { case 'file': - $inhalt = Html::url('file','preview',$link->linkedObjectId,$param); + $inhalt = Html::url('file','show',$link->linkedObjectId,$param); break; case 'page': - $inhalt = Html::url('page','preview',$link->linkedObjectId,$param); + $inhalt = Html::url('page','show',$link->linkedObjectId,$param); break; } } diff --git a/themes/default/css/openrat.css.php b/themes/default/css/openrat.css.php @@ -34,6 +34,13 @@ blockquote, q {quotes:"" "";} a img {border:none;} +html +{ + scrollbar-face-color: <?php echo $_GET['title_background_color']; ?>; + scrollbar-arrow-color: <?php echo $_GET['title_background_color']; ?>; + scrollbar-base-color: <?php echo $_GET['title_text_color']; ?>; +} + iframe { @@ -293,7 +300,9 @@ div.dropdown > a div.dropdown div.entry:hover, div.dropdown div.entry:hover > a { + /* background-color:<?php echo $_GET['inactive_background_color']; ?>; + */ } div.dropdown div.entry { @@ -423,17 +432,6 @@ body.main tr.menu td table tr td.noaction color:<?php echo $_GET['title_background_color']; ?>; } -/* Fenster-Titel */ -body.menu tr.title span.title, -body.main tr.title span.title -{ - font-family:Arial; - font-size:13px; - font-weight:bold; - text-shadow:#cac2a6 2px 1px 3px; -} - - /* Icon-Innenabstand */ img[align=left], img[align=right] {padding-right:1px;padding-left:1px;} @@ -474,11 +472,6 @@ body.main tr.title td /* Hinweis */ td.message { padding:10px; font-weight:bold; } -/* Title-Frame */ -body.title td.title -{ - /*font-family:Verdana,Arial,Helvetica,sans-serif; font-size:11px;*/ -} /* Allgemeine Inhaltszellen */ body.main table.main td.window td @@ -504,8 +497,7 @@ body.main table.main td.window td.act /* Lizenzhinweis */ a.copyright { - font-family:Verdana,Arial,Helvetica,sans-serif; - font-size:9px; + font-size:0.7em; text-decoration:none; } @@ -563,8 +555,11 @@ tr td.help tr.headline td.help { + /* border-bottom:1px solid <?php echo $_GET['text_color']; ?>; + */ font-style: normal; + } /* Logo */ @@ -643,14 +638,6 @@ table.calendar td border: 1px dotted; } -table.main td.help span -{ - padding:10px; - text-align:center; - font-family:Verdana,Arial,Helvetica,sans-serif; - font-size:11px; -} - textarea.editor { width:100%; @@ -731,10 +718,12 @@ ul.tree ul } div.entry.selected, -div.dropdown > div.entry:hover +div.dropdown > div.entry:hover, +div.dropdown > div.entry:hover > a { /*border:1px solid <?php echo $_GET['text_color']; ?>;*/ - background-color:<?php echo $_GET['inactive_background_color']; ?>; + background-color:<?php echo $_GET['title_background_color']; ?>; + color:<?php echo $_GET['title_text_color']; ?>; } @@ -791,6 +780,19 @@ body > div } +/* Strukturen +div.structure ul +{ + padding-left:10px; + margin-left:10px; +} +*/ + +div.structure em +{ + font-style: italic; +} + @@ -822,6 +824,9 @@ div.forward_link div.window > div.menu { padding:0px; + width:100%; + height:25px; + border-bottom: 1px solid <?php echo $_GET['title_background_color'] ?>; } @@ -948,18 +953,26 @@ div.window div.content table table tr.headline > td { + + /* background-color: <?php echo $_GET['inactive_background_color']; ?>; background: -moz-linear-gradient(top, <?php echo $_GET['title_background_color']; ?>, <?php echo $_GET['inactive_background_color']; ?>); background: -webkit-gradient(linear, left top, left bottom, from(<?php echo $_GET['title_background_color']; ?>), to(<?php echo $_GET['inactive_background_color']; ?>)); - border-bottom:1px solid <?php echo $_GET['title_background_color']; ?>; + border-right:1px solid <?php echo $_GET['inactive_background_color']; ?>; + + */ + border-bottom:1px solid <?php echo $_GET['title_background_color']; ?>; padding:3px; + font-weight: bold; } table tr.data > td { border-bottom:1px solid <?php echo $_GET['title_background_color']; ?>; + /* border-right:1px solid <?php echo $_GET['inactive_background_color']; ?>; + */ padding:3px; } @@ -976,7 +989,7 @@ table > tr.data:nth-child(2n) { table tr.data:hover, div#tree div.content li div.entry:hover { - background-color:#EEEEEE; + background-color:<?php echo $_GET['inactive_background_color']; ?>;; } /* Datenzeile mit URL - Mauseffekt */ @@ -1047,7 +1060,7 @@ div#workbench div.bar > div.frame > div.window.fullscreen position:fixed; top:0; left:0; - background-color:<?php echo $_GET['inactive_background_color']; ?>; + background-color:<?php echo $_GET['background_color']; ?>; margin:0px; /*set the width and height to 100% of the screen*/ @@ -1475,7 +1488,7 @@ fieldset > div span.extension, fieldset > div span.ansidate { font-family:Courier; - font-size:14px; + font-size:1em; } @@ -1579,7 +1592,6 @@ body /* Fenster-Hintergrund */ div#header, /* Titelleite-Hintergrund */ div.window > div.menu > div.icons, -div.window > div.content, div.window > div.menu ul.menu li a, /* Tabs */ xdiv.window ul.menu li > span, /* Tabs */ div.window div.header, /* Fenster-Header */ @@ -1588,48 +1600,53 @@ div.window ul.views > li.active:hover { background-color: <?php echo $_GET['title_background_color']; ?>; color: <?php echo $_GET['title_text_color']; ?>; - font-family:Arial; - font-size:13px; } -/* Reiter */ -div.window ul.views li +div#header, /* Titelleite */ +ul.views > li.action /* Tabreiter */ { - background-color: #eeeeee; + font-family: Arial, sans-serif; + font-size:13px; } -div.window ul.views li, -div.dropdown > div.entry +div.content { - font-family:Arial; + font-family: Trebuchet MS, Helvetica, Arial, sans-serif; font-size:13px; - color: blue; } + +/* Reiter */ +div.window ul.views li +{ + background-color:<?php echo $_GET['background_color']; ?>; +} + + div.bar { - background-color:#eeeeee; + background-color:<?php echo $_GET['background_color']; ?>; } div.window ul.views li:hover { - background-color: #bbbbbb; + background-color: <?php echo $_GET['inactive_background_color']; ?>; + /* color: blue; + */ } -div#tree div.content, ul.tree li.last, -ul.tree li:last-child, -table tr.data, +ul.tree li:last-child +{ + background-color:<?php echo $_GET['background_color']; ?>; +} + div.content pre, -div.dropdown, -div.dropdown a +div.dropdown { background-color:<?php echo $_GET['title_text_color']; ?>; - color:blue; - font-family: Trebuchet MS, Helvetica, Arial, sans-serif; - font-size: 1.0em; } @@ -1670,3 +1687,10 @@ div.filler div.headermenu > a.entry, div.filler div.header a.back.button { font-size: 0.8em; +} + + +div.command +{ + visibility: hidden; +}+ \ No newline at end of file diff --git a/themes/default/include/elements.ini.php b/themes/default/include/elements.ini.php @@ -5,12 +5,12 @@ output = button = type:submit,src,class:ok,value:ok,text:button_ok -cell = width,style,class,colspan,rowspan,header:false,title,url,action,id,name +column = width,style,class,colspan,rowspan,header:false,title,url,action,id,name char = type:* checkbox = default:false,readonly:false,name:* date = date dummy = -fieldset = title,icon +group = title,icon focus = field:* form = action,subaction,id,name:,target:_self,method:post,enctype:application/x-www-form-urlencoded,type: frame = file,name,scrolling @@ -41,6 +41,7 @@ radiobox = list:*,name:*,default,onchange:,title:,class: set = var:*,value,key table = class,width:100%,space:0px,padding:0px,widths,rowclasses,columnclasses text = title,class:text,var,text,key,textvar,raw,maxlength,value,suffix,prefix,accesskey,escape:true,type,cut:both +tree = tree upload = name:*,class:upload,maxlength,size:40 user = user window = title,name,icon,widths,width:93%,rowclasses:oddCOMMAeven,columnclasses:1COMMA2COMMA3 \ No newline at end of file diff --git a/themes/default/include/html/cell-end.inc.php b/themes/default/include/html/cell-end.inc.php @@ -1 +0,0 @@ -</td>- \ No newline at end of file diff --git a/themes/default/include/html/cell.inc.php b/themes/default/include/html/cell.inc.php @@ -1,32 +0,0 @@ -<?php $column_idx++; ?><td -#IF-ATTR width# - width="%width%" -#ELSE# -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -#END-IF# -#IF-ATTR style# - style="%style%" -#END-IF# -#IF-ATTR class# - class="%class%" -#ELSE# -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> -#END-IF# -#IF-ATTR colspan# - colspan="%colspan%" -#END-IF# -#IF-ATTR rowspan# - rowspan="%rowspan%" -#END-IF# -#IF-ATTR title# - title="%title%" -#END-IF# - -#IF-ATTR id# - onclick="javascript:openNewAction('<?php echo $attr_name ?>','<?php echo $attr_action ?>','<?php echo $attr_id ?>'); " -#END-IF# ->- \ No newline at end of file diff --git a/themes/default/include/html/column-end.inc.php b/themes/default/include/html/column-end.inc.php @@ -0,0 +1 @@ +</td>+ \ No newline at end of file diff --git a/themes/default/include/html/column.inc.php b/themes/default/include/html/column.inc.php @@ -0,0 +1,32 @@ +<?php $column_idx++; ?><td +#IF-ATTR width# + width="%width%" +#ELSE# +<?php if (!empty($column_widths)) { ?> + width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" +<?php } ?> +#END-IF# +#IF-ATTR style# + style="%style%" +#END-IF# +#IF-ATTR class# + class="%class%" +#ELSE# +<?php if (!empty($column_classes)) { ?> + class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" +<?php } ?> +#END-IF# +#IF-ATTR colspan# + colspan="%colspan%" +#END-IF# +#IF-ATTR rowspan# + rowspan="%rowspan%" +#END-IF# +#IF-ATTR title# + title="%title%" +#END-IF# + +#IF-ATTR id# + onclick="javascript:openNewAction('<?php echo $attr_name ?>','<?php echo $attr_action ?>','<?php echo $attr_id ?>'); " +#END-IF# +>+ \ No newline at end of file diff --git a/themes/default/include/html/fieldset-end.inc.php b/themes/default/include/html/fieldset-end.inc.php @@ -1 +0,0 @@ -</fieldset>- \ No newline at end of file diff --git a/themes/default/include/html/fieldset.inc.php b/themes/default/include/html/fieldset.inc.php @@ -1 +0,0 @@ -<fieldset><?php if(isset($attr_title)) { ?><legend><?php if(isset($attr_icon)) { ?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" align="left" border="0" /><?php } ?> <?php echo encodeHtml($attr_title) ?> </legend><?php } ?>- \ No newline at end of file diff --git a/themes/default/include/html/form-end.inc.php b/themes/default/include/html/form-end.inc.php @@ -2,7 +2,7 @@ <div class="bottom"> <div class="command"> <input type="button" class="submit" value="<?php echo lang('BUTTON_OK') ?>" onclick="$(this).closest('div.window').find('form').submit();" /> - <input type="button" class="submit" value="<?php echo lang('CANCEL') ?>" onclick="$('ul#history li.active').click();" /> + <input type="button" class="submit" value="<?php echo lang('CANCEL') ?>" onclick="$(this).closest('div.window').find('ul.views > li.active').click();" /> </div> </div> diff --git a/themes/default/include/html/group-end.inc.php b/themes/default/include/html/group-end.inc.php @@ -0,0 +1 @@ +</fieldset>+ \ No newline at end of file diff --git a/themes/default/include/html/group.inc.php b/themes/default/include/html/group.inc.php @@ -0,0 +1 @@ +<fieldset><?php if(isset($attr_title)) { ?><legend><?php if(isset($attr_icon)) { ?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" align="left" border="0" /><?php } ?> <?php echo encodeHtml($attr_title) ?> </legend><?php } ?>+ \ No newline at end of file diff --git a/themes/default/include/html/inputarea.inc.php b/themes/default/include/html/inputarea.inc.php @@ -1,4 +1 @@ -<?php if ($this->isEditMode()) { -?><textarea class="<?php echo $attr_class ?>" name="<?php echo $attr_name ?>" rows="<?php echo $attr_rows ?>" cols="<?php echo $attr_cols ?>"><?php echo htmlentities(isset($$attr_name)?$$attr_name:$attr_default) ?></textarea><?php - } else { -?><span class="<?php echo $attr_class ?>"><?php echo isset($$attr_name)?$$attr_name:$attr_default ?></span><?php } ?>- \ No newline at end of file +<div class="inputholder"><textarea class="<?php echo $attr_class ?>" name="<?php echo $attr_name ?>" rows="<?php echo $attr_rows ?>" cols="<?php echo $attr_cols ?>"><?php echo htmlentities(isset($$attr_name)?$$attr_name:$attr_default) ?></textarea></div>+ \ No newline at end of file diff --git a/themes/default/include/html/tree.inc.php b/themes/default/include/html/tree.inc.php @@ -0,0 +1,33 @@ +<?php showList($attr_tree); + +function showList( $contents ) +{ + //Html::debug($contents,'contents'); + + echo '<ul class="tree">'; + foreach( $contents as $key=>$el) { + + //Html::debug($el['name'],'Name'); + $selected = isset($el['self']); + if ($selected ) + echo '<li class="">'; + else + echo '<li>'; + + echo '<div class="tree" />'; + echo '<div class="entry '.($selected?' selected':'').'" onclick="javascript:openNewAction( \''.$el['name'].'\',\''.$el['type'].'\',\''.$el['id'].'\',0 );">'; + //Html::debug($el); + echo '<img src="'.OR_THEMES_EXT_DIR.'default/images/icon_'.$el['type'].'.png" />'; + echo $el['name']; + echo '</div>'; + + if ( isset($el['children']) ) + { + showList($el['children'] ); + } + + echo '</li>'; + } + echo '</ul>'; +} +?>+ \ No newline at end of file diff --git a/themes/default/js/openrat.js b/themes/default/js/openrat.js @@ -270,7 +270,9 @@ function loadView(jo, url ) //$.get( createUrl('login','ping',0) ); //alert( "user: "+$('#uname').attr('value') ); //alert( "up: "+$('#upassword').attr('value') ); - $(jo).find('input.focus').focus(); + + // Fokus nicht setzen, da mehrere Views sich sonst um den Fokus streiten. + //$(jo).find('input.focus').focus(); // Sortieren von Tabellen $(jo).find('table.sortable > tbody').sortable({ @@ -372,6 +374,10 @@ function loadView(jo, url ) $(el).removeClass('button').wrap('<div class="entry perview" />').parent().appendTo( $(jo).closest('div.frame').find('div.menu div.dropdown').first() ); } ); $(jo).find('div.header').html('<!-- moved to window-menu -->'); + + $(jo).find('input,select,textarea').focus( function() { + $(this).closest('div.frame').find('div.command').css('visibility','visible').fadeIn('slow'); + }); }); } diff --git a/themes/default/js/screenwidth.js b/themes/default/js/screenwidth.js @@ -1 +0,0 @@ -document.forms[0].screenwidth.value=window.innerWidth; diff --git a/themes/default/layout/perspective/normal.ini.php b/themes/default/layout/perspective/normal.ini.php @@ -31,6 +31,6 @@ refreshable=true title= default=structure -views=structure,info,archive,rights +views=structure,info,preview,clipboard,console,archive,rights refreshable=true diff --git a/themes/default/templates/configuration/show.tpl.src.xml b/themes/default/templates/configuration/show.tpl.src.xml @@ -2,21 +2,21 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell class="help"> + <column class="help"> <text key="GLOBAL_NAME"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text key="GLOBAL_VALUE"></text> - </cell> + </column> </row> <list list="config" extract="true"> <row class="data"> - <cell> + <column> <text var="key"></text> - </cell> - <cell class="var:class"> + </column> + <column class="var:class"> <text class="var:class" var="value"></text> - </cell> + </column> </row> </list> </table> diff --git a/themes/default/templates/element/delete.tpl.src.xml b/themes/default/templates/element/delete.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true"></header> <form> - <fieldset> + <group> <part class="line"> <part class="label"> <text key="ELEMENT_NAME"></text> @@ -11,8 +11,8 @@ <text var="name" class="name"></text> </part> </part> - </fieldset> - <fieldset title="message:options"> + </group> + <group title="message:options"> <part class="line"> <part class="label"> @@ -42,7 +42,7 @@ </label> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/element/name.tpl.src.xml b/themes/default/templates/element/name.tpl.src.xml @@ -4,25 +4,25 @@ <form> <window name="GLOBAL_NAME"> <row> - <cell> + <column> <text text="ELEMENT_NAME"></text> - </cell> - <cell> + </column> + <column> <input name="name"></input> - </cell> + </column> </row> <row> - <cell> + <column> <text text="GLOBAL_DESCRIPTION"></text> - </cell> - <cell> + </column> + <column> <inputarea name="description" rows="5" cols="50"></inputarea> - </cell> + </column> </row> <row> - <cell colspan="2" class="act"> + <column colspan="2" class="act"> <button type="ok"></button> - </cell> + </column> </row> </window> </form> diff --git a/themes/default/templates/element/prop.tpl.src.xml b/themes/default/templates/element/prop.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header></header> <form> - <fieldset> + <group> <if present="subtype"> <part class="line"> <part class="label"> @@ -230,6 +230,6 @@ </part> </part> </if> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/element/properties.tpl.src.xml b/themes/default/templates/element/properties.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="GLOBAL_PREFS" widths="30%,70%"><if present="subtype"><row><cell><text text="ELEMENT_SUBTYPE"></text></cell><cell><if present="subtypes"><selectbox name="subtype" list="subtypes" addempty="true"></selectbox></if><if not="true" present="subtypes"><input name="subtype"></input></if></cell></row></if><if present="with_icon"><row><cell><text text="EL_PROP_WITH_ICON"></text></cell><cell><checkbox name="with_icon"></checkbox></cell></row></if><if present="all_languages"><row><cell><text text="EL_PROP_ALL_LANGUAGES"></text></cell><cell><checkbox name="all_languages"></checkbox></cell></row></if><if present="writable"><row><cell><text text="EL_PROP_writable"></text></cell><cell><checkbox name="writable"></checkbox></cell></row></if><if present="width"><row><cell><text text="width"></text></cell><cell><input size="10" name="width"></input></cell></row></if><if present="height"><row><cell><text text="height"></text></cell><cell><input size="10" name="height"></input></cell></row></if><if present="dateformat"><row><cell><text text="EL_PROP_DATEFORMAT"></text></cell><cell><selectbox name="dateformat" list="dateformats"></selectbox></cell></row></if><if present="format"><row><cell><text text="EL_PROP_FORMAT"></text></cell><cell><radiobox name="format" list="formatlist"></radiobox></cell></row></if><if present="decimals"><row><cell><text text="EL_PROP_DECIMALS"></text></cell><cell><input size="10" maxlength="2" name="decimals"></input></cell></row></if><if present="dec_point"><row><cell><text text="EL_PROP_DEC_POINT"></text></cell><cell><input size="10" maxlength="5" name="dec_point"></input></cell></row></if><if present="thousand_sep"><row><cell><text text="EL_PROP_thousand_sep"></text></cell><cell><input size="10" maxlength="1" name="thousand_sep"></input></cell></row></if><if present="default_text"><row><cell><text text="EL_PROP_default_text"></text></cell><cell><input size="40" maxlength="255" name="default_text"></input></cell></row></if><if present="default_longtext"><row><cell><text text="EL_PROP_default_longtext"></text></cell><cell><inputarea rows="10" cols="40" name="default_longtext"></inputarea></cell></row></if><if present="parameters"><row><cell><text text="EL_PROP_DYNAMIC_PARAMETERS"></text></cell><cell><inputarea rows="15" cols="40" name="parameters"></inputarea></cell></row><row><cell></cell><cell><list list="dynamic_class_parameters" key="paramName" value="defaultValue"><text var="paramName"></text><text raw="_("></text><text text="GLOBAL_DEFAULT"></text><text raw=")_=_"></text><text var="defaultValue"></text><newline></newline></list></cell></row></if><if present="select_items"><row><cell><text text="EL_PROP_select_items"></text></cell><cell><inputarea rows="15" cols="40" name="select_items"></inputarea></cell></row></if><if present="linkelement"><row><cell><text text="EL_LINK"></text></cell><cell><selectbox name="linkelement" list="linkelements"></selectbox></cell></row></if><if present="name"><row><cell><text text="ELEMENT_NAME"></text></cell><cell><selectbox name="name" list="names"></selectbox></cell></row></if><if present="folderobjectid"><row><cell><text text="EL_PROP_DEFAULT_FOLDEROBJECT"></text></cell><cell><selectbox name="folderobjectid" list="folders"></selectbox></cell></row></if><if present="default_objectid"><row><cell><text text="EL_PROP_DEFAULT_OBJECT"></text></cell><cell><selectbox name="default_objectid" list="objects" addempty="true"></selectbox></cell></row></if><if present="code"><row><cell><text text="EL_PROP_code"></text></cell><cell><inputarea name="code" rows="35" cols="60"></inputarea></cell></row></if><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 + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="GLOBAL_PREFS" widths="30%,70%"><if present="subtype"><row><column><text text="ELEMENT_SUBTYPE"></text></column><column><if present="subtypes"><selectbox name="subtype" list="subtypes" addempty="true"></selectbox></if><if not="true" present="subtypes"><input name="subtype"></input></if></column></row></if><if present="with_icon"><row><column><text text="EL_PROP_WITH_ICON"></text></column><column><checkbox name="with_icon"></checkbox></column></row></if><if present="all_languages"><row><column><text text="EL_PROP_ALL_LANGUAGES"></text></column><column><checkbox name="all_languages"></checkbox></column></row></if><if present="writable"><row><column><text text="EL_PROP_writable"></text></column><column><checkbox name="writable"></checkbox></column></row></if><if present="width"><row><column><text text="width"></text></column><column><input size="10" name="width"></input></column></row></if><if present="height"><row><column><text text="height"></text></column><column><input size="10" name="height"></input></column></row></if><if present="dateformat"><row><column><text text="EL_PROP_DATEFORMAT"></text></column><column><selectbox name="dateformat" list="dateformats"></selectbox></column></row></if><if present="format"><row><column><text text="EL_PROP_FORMAT"></text></column><column><radiobox name="format" list="formatlist"></radiobox></column></row></if><if present="decimals"><row><column><text text="EL_PROP_DECIMALS"></text></column><column><input size="10" maxlength="2" name="decimals"></input></column></row></if><if present="dec_point"><row><column><text text="EL_PROP_DEC_POINT"></text></column><column><input size="10" maxlength="5" name="dec_point"></input></column></row></if><if present="thousand_sep"><row><column><text text="EL_PROP_thousand_sep"></text></column><column><input size="10" maxlength="1" name="thousand_sep"></input></column></row></if><if present="default_text"><row><column><text text="EL_PROP_default_text"></text></column><column><input size="40" maxlength="255" name="default_text"></input></column></row></if><if present="default_longtext"><row><column><text text="EL_PROP_default_longtext"></text></column><column><inputarea rows="10" cols="40" name="default_longtext"></inputarea></column></row></if><if present="parameters"><row><column><text text="EL_PROP_DYNAMIC_PARAMETERS"></text></column><column><inputarea rows="15" cols="40" name="parameters"></inputarea></column></row><row><column></column><column><list list="dynamic_class_parameters" key="paramName" value="defaultValue"><text var="paramName"></text><text raw="_("></text><text text="GLOBAL_DEFAULT"></text><text raw=")_=_"></text><text var="defaultValue"></text><newline></newline></list></column></row></if><if present="select_items"><row><column><text text="EL_PROP_select_items"></text></column><column><inputarea rows="15" cols="40" name="select_items"></inputarea></column></row></if><if present="linkelement"><row><column><text text="EL_LINK"></text></column><column><selectbox name="linkelement" list="linkelements"></selectbox></column></row></if><if present="name"><row><column><text text="ELEMENT_NAME"></text></column><column><selectbox name="name" list="names"></selectbox></column></row></if><if present="folderobjectid"><row><column><text text="EL_PROP_DEFAULT_FOLDEROBJECT"></text></column><column><selectbox name="folderobjectid" list="folders"></selectbox></column></row></if><if present="default_objectid"><row><column><text text="EL_PROP_DEFAULT_OBJECT"></text></column><column><selectbox name="default_objectid" list="objects" addempty="true"></selectbox></column></row></if><if present="code"><row><column><text text="EL_PROP_code"></text></column><column><inputarea name="code" rows="35" cols="60"></inputarea></column></row></if><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/element/type.tpl.src.xml b/themes/default/templates/element/type.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true"></header> <form> - <fieldset> + <group> <part class="line"> <part class="label"> <text text="ELEMENT_TYPE"></text> @@ -11,7 +11,7 @@ <selectbox name="type" list="types" lang="true"></selectbox> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/file/compress.tpl.src.xml b/themes/default/templates/file/compress.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="asdf" title="asdfdfs"><row><cell><text text="type"></text></cell><cell><set var="gz" value="gz"></set><selectbox list="formats" name="format" default="gz"></selectbox></cell></row><row><cell colspan="2"><fieldset title="message:OPTIONS"></fieldset></cell></row><row><cell></cell><cell><set var="replace" value="1"></set><radio name="replace" value="1"></radio><label for="replace_1"><text key="replace"></text></label><newline></newline><radio name="replace" value="0"></radio><label for="replace_0"><text key="new"></text></label></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="asdf" title="asdfdfs"><row><column><text text="type"></text></column><column><set var="gz" value="gz"></set><selectbox list="formats" name="format" default="gz"></selectbox></column></row><row><column colspan="2"><group title="message:OPTIONS"></group></column></row><row><column></column><column><set var="replace" value="1"></set><radio name="replace" value="1"></radio><label for="replace_1"><text key="replace"></text></label><newline></newline><radio name="replace" value="0"></radio><label for="replace_0"><text key="new"></text></label></column></row><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/file/editvalue.tpl.src.xml b/themes/default/templates/file/editvalue.tpl.src.xml @@ -1,3 +1,3 @@ <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><row><cell><text text="GLOBAL_VALUE"></text></cell><cell><inputarea rows="40" name="value" class="editor"></inputarea></cell></row><row><cell class="act" colspan="2"><button type="ok"></button></cell></row></window></form><focus field="value"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window><row><column><text text="GLOBAL_VALUE"></text></column><column><inputarea rows="40" name="value" class="editor"></inputarea></column></row><row><column class="act" colspan="2"><button type="ok"></button></column></row></window></form><focus field="value"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/file/extract.tpl.src.xml b/themes/default/templates/file/extract.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="asdf" title="asdfdfs"><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="asdf" title="asdfdfs"><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/file/info.tpl.src.xml b/themes/default/templates/file/info.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <fieldset> + <group> <part class="line"> <part class="label"> <text text="global_name"></text> @@ -34,9 +34,9 @@ <text var="description" /> </part> </part> - </fieldset> + </group> - <fieldset title="message:additional_info"> + <group title="message:additional_info"> <part class="line"> <part class="label"> <label for="full_filename"> @@ -104,12 +104,12 @@ <table> <list list="pages" extract="true"> <row> - <cell> + <column> <link url="var:url" target="cms_main"> <image type="page"></image> <text var="name"></text> </link> - </cell> + </column> </row> </list> </table> @@ -118,8 +118,8 @@ </if> </part> </part> - </fieldset> - <fieldset title="message:prop_userinfo"> + </group> + <group title="message:prop_userinfo"> <part class="line"> <part class="label"> <text text="global_created"></text> @@ -144,6 +144,6 @@ <user user="var:lastchange_user"></user> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/file/preview.tpl.src.xml b/themes/default/templates/file/preview.tpl.src.xml @@ -0,0 +1,12 @@ +<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"> + <insert url="var:preview_url"></insert> + <link class="action" action="file" subaction="edit"> + <image file="icon/edit"></image> + <text key="menu_file_edit"></text> + </link> + <link class="action" action="file" subaction="editvalue"> + <image file="icon/editvalue"></image> + <text key="menu_file_editvalue"></text> + </link> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/file/prop.tpl.src.xml b/themes/default/templates/file/prop.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="size,compress,uncompress,extract"></header> <form> - <fieldset> + <group> <part class="line"> <part class="label"> <label for="name"> @@ -43,7 +43,7 @@ <inputarea name="description" class="description"></inputarea> </part> </part> - </fieldset> + </group> <link class="action" action="file" subaction="compress"> <image file="icon/compress"></image> diff --git a/themes/default/templates/file/pub.tpl.src.xml b/themes/default/templates/file/pub.tpl.src.xml @@ -1,3 +1,3 @@ <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><row><cell><newline></newline><newline></newline><newline></newline><newline></newline><newline></newline></cell></row><row><cell class="act"><button type="ok"></button></cell></row></window></form></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window><row><column><newline></newline><newline></newline><newline></newline><newline></newline><newline></newline></column></row><row><column class="act"><button type="ok"></button></column></row></window></form></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/file/remove.tpl.src.xml b/themes/default/templates/file/remove.tpl.src.xml @@ -1,3 +1,3 @@ <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="group" name="GLOBAL_GROUPS"><row><cell><text text="GLOBAL_NAME"></text></cell><cell><text var="name"></text></cell></row><row><cell><text text="GLOBAL_DELETE"></text></cell><cell><checkbox name="delete"></checkbox></cell></row><row><cell colspan="2"><button type="ok"></button></cell></row></window></form><focus field="delete"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window icon="group" name="GLOBAL_GROUPS"><row><column><text text="GLOBAL_NAME"></text></column><column><text var="name"></text></column></row><row><column><text text="GLOBAL_DELETE"></text></column><column><checkbox name="delete"></checkbox></column></row><row><column colspan="2"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/file/show.tpl.src.xml b/themes/default/templates/file/show.tpl.src.xml @@ -1,3 +1,3 @@ <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><window icon="folder"><row><cell colspan="2"><insert url="var:preview_url"></insert><link class="action" action="file" subaction="edit"><image file="icon/edit"></image><text key="menu_file_edit"></text></link><link class="action" action="file" subaction="editvalue"><image file="icon/editvalue"></image><text key="menu_file_editvalue"></text></link></cell></row></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window icon="folder"><row><column colspan="2"><insert url="var:preview_url"></insert><link class="action" action="file" subaction="edit"><image file="icon/edit"></image><text key="menu_file_edit"></text></link><link class="action" action="file" subaction="editvalue"><image file="icon/editvalue"></image><text key="menu_file_editvalue"></text></link></column></row></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/file/size.tpl.src.xml b/themes/default/templates/file/size.tpl.src.xml @@ -2,83 +2,83 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <form> <row> - <cell colspan="2"> + <column colspan="2"> <text text="IMAGE_OLD_SIZE"></text> - </cell> - <cell> + </column> + <column> <text var="width"></text> <text raw="_*_"></text> <text var="height"></text> - </cell> + </column> </row> <if not="" empty="formats"> <row> - <cell colspan="3"> - <fieldset title="message:IMAGE_NEW_SIZE"></fieldset> - </cell> + <column colspan="3"> + <group title="message:IMAGE_NEW_SIZE"></group> + </column> </row> <row> - <cell> + <column> <radio name="type" value="factor"></radio> - </cell> - <cell> + </column> + <column> <label for="type_factor"> <text text="FILE_IMAGE_SIZE_FACTOR"></text> </label> - </cell> - <cell> + </column> + <column> <selectbox name="factor" list="factors"></selectbox> <set var="factor" value="1"></set> - </cell> + </column> </row> <row> - <cell> + <column> <radio name="type" value="input"></radio> - </cell> - <cell> + </column> + <column> <label for="type_input"> <text text="FILE_IMAGE_NEW_WIDTH_HEIGHT"></text> </label> - </cell> - <cell> + </column> + <column> <input name="width" size="10"></input> <text raw="_*_"></text> <input name="height" size="10"></input> - </cell> + </column> </row> <row> - <cell colspan="3"> - <fieldset title="message:options"></fieldset> - </cell> + <column colspan="3"> + <group title="message:options"></group> + </column> </row> <row> - <cell colspan="2"> + <column colspan="2"> <label for="format"> <text text="FILE_IMAGE_FORMAT"></text> </label> - </cell> - <cell> + </column> + <column> <selectbox name="format" list="formats"></selectbox> - </cell> + </column> </row> <row> - <cell colspan="2"> + <column colspan="2"> <label for="jpeglist_compression"> <text text="FILE_IMAGE_JPEG_COMPRESSION"></text> </label> - </cell> - <cell> + </column> + <column> <set var="jpeg_compression" value="70"></set> <selectbox list="jpeglist" name="jpeg_compression"></selectbox> - </cell> + </column> </row> <row> - <cell colspan="3"> + <column colspan="3"> <checkbox name="copy"></checkbox> <label for="copy"> <text key="copy"></text> </label> - </cell> + </column> </row> </if> <focus field="width"></focus> diff --git a/themes/default/templates/file/structure.tpl.src.xml b/themes/default/templates/file/structure.tpl.src.xml @@ -0,0 +1,7 @@ +<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"> + <part class="structure tree"> + <tree tree="var:outline"></tree> + </part> + +</output>+ \ No newline at end of file diff --git a/themes/default/templates/file/uncompress.tpl.src.xml b/themes/default/templates/file/uncompress.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="asdf" title="asdfdfs"><row><cell colspan="2"><fieldset title="message:options"></fieldset></cell></row><row><cell></cell><cell><set var="replace" value="1"></set><radio name="replace" value="1"></radio><label for="replace_1"><text key="replace"></text></label><newline></newline><radio name="replace" value="0"></radio><label for="replace_0"><text key="new"></text></label></cell></row><row><cell class="act" colspan="2"><button type="ok"></button></cell></row></window></form></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="asdf" title="asdfdfs"><row><column colspan="2"><group title="message:options"></group></column></row><row><column></column><column><set var="replace" value="1"></set><radio name="replace" value="1"></radio><label for="replace_1"><text key="replace"></text></label><newline></newline><radio name="replace" value="0"></radio><label for="replace_0"><text key="new"></text></label></column></row><row><column class="act" colspan="2"><button type="ok"></button></column></row></window></form></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/filebrowser/browse.tpl.src.xml b/themes/default/templates/filebrowser/browse.tpl.src.xml @@ -1,3 +1,3 @@ <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"><page><window icon="folder"><list list="notices" extract="true"><row class="headline"><cell colspan="2"><text key="var:key"></text><newline></newline></cell></row></list><table><row class="headline"><cell><text key="GLOBAL_TYPE"></text><text raw="_/_"></text><text key="GLOBAL_NAME"></text></cell><cell><text key="GLOBAL_LASTCHANGE"></text></cell></row><if present="up_url"><row class="data"><cell width="50%" colspan="8"><link url="var:up_url"><image type="folder"></image><text raw="__.._____________________"></text></link></cell></row></if><list list="object" extract="true"><row class="data"><cell><link url="var:url" title="var:desc" class="var:class"><image type="var:icon"></image><text var="name"></text><text raw="_"></text></link></cell><cell><date date="var:date"></date></cell></row></list><if empty="object"><row><cell colspan="2"><text text="GLOBAL_NOT_FOUND"></text></cell></row></if><if true="var:writable"><row><cell class="act" colspan="2"><newline></newline><form action="filebrowser" subaction="upload" id="var:id" enctype="multipart/form-data"><hidden name="CKEditorFuncNum"></hidden><text key="file"></text><text raw="__"></text><upload name="file"></upload><text raw="__"></text><button type="ok" text="add"></button></form><newline></newline><newline></newline><set var="name" value=""></set><form action="filebrowser" subaction="addfolder" id="var:id"><hidden name="CKEditorFuncNum"></hidden><text key="folder"></text><text raw="__"></text><input name="name"></input><text raw="__"></text><button type="ok" text="add"></button></form></cell></row></if></table></window></page></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><page><window icon="folder"><list list="notices" extract="true"><row class="headline"><column colspan="2"><text key="var:key"></text><newline></newline></column></row></list><table><row class="headline"><column><text key="GLOBAL_TYPE"></text><text raw="_/_"></text><text key="GLOBAL_NAME"></text></column><column><text key="GLOBAL_LASTCHANGE"></text></column></row><if present="up_url"><row class="data"><column width="50%" colspan="8"><link url="var:up_url"><image type="folder"></image><text raw="__.._____________________"></text></link></column></row></if><list list="object" extract="true"><row class="data"><column><link url="var:url" title="var:desc" class="var:class"><image type="var:icon"></image><text var="name"></text><text raw="_"></text></link></column><column><date date="var:date"></date></column></row></list><if empty="object"><row><column colspan="2"><text text="GLOBAL_NOT_FOUND"></text></column></row></if><if true="var:writable"><row><column class="act" colspan="2"><newline></newline><form action="filebrowser" subaction="upload" id="var:id" enctype="multipart/form-data"><hidden name="CKEditorFuncNum"></hidden><text key="file"></text><text raw="__"></text><upload name="file"></upload><text raw="__"></text><button type="ok" text="add"></button></form><newline></newline><newline></newline><set var="name" value=""></set><form action="filebrowser" subaction="addfolder" id="var:id"><hidden name="CKEditorFuncNum"></hidden><text key="folder"></text><text raw="__"></text><input name="name"></input><text raw="__"></text><button type="ok" text="add"></button></form></column></row></if></table></window></page></output>+ \ No newline at end of file diff --git a/themes/default/templates/folder/create.tpl.src.xml b/themes/default/templates/folder/create.tpl.src.xml @@ -3,97 +3,97 @@ <header back="true" views="createfolder,createlink,createpage,createfile"></header> <form enctype="multipart/form-data"> <row> - <cell colspan="3"> - <fieldset title="message:folder"></fieldset> - </cell> + <column colspan="3"> + <group title="message:folder"></group> + </column> </row> <row> - <cell> + <column> <radio name="type" value="folder" children="folder_name"></radio> - </cell> - <cell> + </column> + <column> <label for="type_folder"> <text text="global_folder"></text> </label> - </cell> - <cell> + </column> + <column> <input name="folder_name" size="30" maxlength="250" default="" class="name"></input> - </cell> + </column> </row> <row> - <cell colspan="3"> - <fieldset title="message:file"></fieldset> - </cell> + <column colspan="3"> + <group title="message:file"></group> + </column> </row> <row> - <cell> + <column> <radio name="type" value="file" children="file"></radio> - </cell> - <cell> + </column> + <column> <label for="type_file"> <text text="global_FILE"></text> </label> - </cell> - <cell> + </column> + <column> <upload name="file" size="30" maxlength="var:maxlength"></upload> <newline></newline> <text class="help" key="file_max_size"></text> <text raw="_"></text> <text var="max_size"></text> - </cell> + </column> </row> <row> - <cell colspan="3"> - <fieldset title="message:page"></fieldset> - </cell> + <column colspan="3"> + <group title="message:page"></group> + </column> </row> <row> - <cell> + <column> <radio name="type" value="page" children="page_templateid,page_name"></radio> - </cell> - <cell> + </column> + <column> <label for="type_page"> <text text="global_TEMPLATE"></text> </label> - </cell> - <cell> + </column> + <column> <selectbox name="page_templateid" list="templates"></selectbox> - </cell> + </column> </row> <row> - <cell></cell> - <cell> + <column></column> + <column> <label for="type_page"> <text text="global_NAME"></text> </label> - </cell> - <cell> + </column> + <column> <input name="page_name" size="30" maxlength="250" class="name"></input> - </cell> + </column> </row> <row> - <cell colspan="3"> - <fieldset title="message:link"></fieldset> - </cell> + <column colspan="3"> + <group title="message:link"></group> + </column> </row> <row> - <cell> + <column> <radio name="type" value="link" children="link_name"></radio> - </cell> - <cell> + </column> + <column> <label for="type_link"> <text text="global_NAME"></text> </label> - </cell> - <cell> + </column> + <column> <input name="link_name" size="30" maxlength="250" class="name"></input> - </cell> + </column> </row> <row> - <cell class="act" colspan="3"> + <column class="act" colspan="3"> <button type="ok"></button> - </cell> + </column> </row> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/folder/createfile.tpl.src.xml b/themes/default/templates/folder/createfile.tpl.src.xml @@ -1,3 +1,3 @@ <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 enctype="multipart/form-data" target="upload" type="upload"><hidden name="type" default="file"></hidden><window title="" name=""><row><cell><text text="global_FILE"></text></cell><cell><upload name="file" maxlength="var:maxlength"></upload><insert url="" name="upload"></insert></cell></row><row><cell colspan="2"><text class="help" key="file_max_size"></text><text raw="_"></text><text var="max_size"></text><newline></newline><newline></newline></cell></row><row><cell><text key="HTTP_URL"></text></cell><cell><input name="url" size="50"></input></cell></row><row><cell colspan="2"><fieldset title="message:description"></fieldset></cell></row><row><cell><text text="global_NAME"></text></cell><cell><input name="name" size="50"></input></cell></row><row><cell><text text="global_DESCRIPTION"></text></cell><cell><inputarea rows="5" cols="50" name="description"></inputarea><newline></newline></cell></row></window></form><focus field="name"></focus></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><header back="true"></header><form enctype="multipart/form-data" target="upload" type="upload"><hidden name="type" default="file"></hidden><window title="" name=""><row><column><text text="global_FILE"></text></column><column><upload name="file" maxlength="var:maxlength"></upload><insert url="" name="upload"></insert></column></row><row><column colspan="2"><text class="help" key="file_max_size"></text><text raw="_"></text><text var="max_size"></text><newline></newline><newline></newline></column></row><row><column><text key="HTTP_URL"></text></column><column><input name="url" size="50"></input></column></row><row><column colspan="2"><group title="message:description"></group></column></row><row><column><text text="global_NAME"></text></column><column><input name="name" size="50"></input></column></row><row><column><text text="global_DESCRIPTION"></text></column><column><inputarea rows="5" cols="50" name="description"></inputarea><newline></newline></column></row></window></form><focus field="name"></focus></output>+ \ No newline at end of file diff --git a/themes/default/templates/folder/createlink.tpl.src.xml b/themes/default/templates/folder/createlink.tpl.src.xml @@ -1,3 +1,3 @@ <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><header back="true"></header><form><window title="" name=""><row><cell><text text="global_NAME"></text></cell><cell><input name="name" size="20" default=""></input></cell></row><row><cell><text text="global_DESCRIPTION"></text></cell><cell><inputarea rows="5" cols="50" name="description"></inputarea></cell></row><row><cell class="act" colspan="2"><button type="ok"></button></cell></row></window></form><focus field="name"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><header back="true"></header><form><window title="" name=""><row><column><text text="global_NAME"></text></column><column><input name="name" size="20" default=""></input></column></row><row><column><text text="global_DESCRIPTION"></text></column><column><inputarea rows="5" cols="50" name="description"></inputarea></column></row><row><column class="act" colspan="2"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/folder/edit.tpl.src.xml b/themes/default/templates/folder/edit.tpl.src.xml @@ -4,36 +4,36 @@ <form action="folder" subaction="edit"> <table> <row class="headline"> - <cell class="help"> + <column class="help"> <text key="SELECT"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text key="GLOBAL_TYPE"></text> <text raw="_/_"></text> <text key="GLOBAL_NAME"></text> - </cell> + </column> </row> <list list="object" extract="true"> <row class="data"> - <cell> + <column> <if true="writable"> <checkbox name="var:id"></checkbox> </if> <if false="writable"> <text raw="_"></text> </if> - </cell> - <cell> + </column> + <column> <label for="var:id"> <image type="var:icon"></image> <text var="name"></text> <text raw="_"></text> </label> - </cell> + </column> </row> </list> <row> - <cell colspan="2"> + <column colspan="2"> <image fileext="tree_none_end.gif" align="left"></image> <text raw="_"></text> <link var1="markall" value1="1" action="var:actionName" @@ -48,11 +48,11 @@ <link url=":javascript:flip();"> <text key="FOLDER_FLIP_MARK"></text> </link> - </cell> + </column> </row> <row> - <cell colspan="2"> - <fieldset title="message:options"> + <column colspan="2"> + <group title="message:options"> <set var="type" value="var:defaulttype"></set> <list list="actionlist" value="actiontype"> <radio name="type" value="var:actiontype"></radio> @@ -62,19 +62,19 @@ </label> <newline></newline> </list> - </fieldset> - </cell> + </group> + </column> </row> <row> - <cell class="act" colspan="2"> + <column class="act" colspan="2"> <button type="ok" text="button_next"></button> - </cell> + </column> </row> <if empty="object"> <row> - <cell colspan="2"> + <column colspan="2"> <text text="GLOBAL_NOT_FOUND"></text> - </cell> + </column> </row> </if> </table> diff --git a/themes/default/templates/folder/info.tpl.src.xml b/themes/default/templates/folder/info.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <form> - <fieldset title="message:GLOBAL_PROP"> + <group title="message:GLOBAL_PROP"> <part class="line"> <part class="label"> <label for="name" key="global_name" /> @@ -27,9 +27,9 @@ <text var="description" class="description" /> </part> </part> - </fieldset> + </group> - <fieldset title="message:additional_info"> + <group title="message:additional_info"> <part class="line"> <part class="label"> <label for="full_filename" key="FULL_FILENAME" /> @@ -47,9 +47,9 @@ <text var="objectid"></text> </part> </part> - </fieldset> + </group> - <fieldset title="message:PROP_USERINFO"> + <group title="message:PROP_USERINFO"> <part class="line"> <part class="label"> <label for="create_user" key="global_created"> @@ -77,6 +77,6 @@ <user user="var:lastchange_user"></user> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/folder/inherit.tpl.src.xml b/themes/default/templates/folder/inherit.tpl.src.xml @@ -4,7 +4,7 @@ <form> <if value="var:type" equals="folder"> - <fieldset title="message:options"> + <group title="message:options"> <part class="line"> <part class="label"> </part> @@ -16,7 +16,7 @@ </label> </part> </part> - </fieldset> + </group> </if> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/folder/order.tpl.src.xml b/themes/default/templates/folder/order.tpl.src.xml @@ -5,12 +5,12 @@ <input type="hidden" name="token" default="function:token"></input> <table class="sortable"> <row class="headline"> - <cell class="help" colspan="4"> + <column class="help" colspan="4"> <link type="url" url="var:flip_url" title="message:FOLDER_FLIP"> <text key="FOLDER_ORDER"></text> </link> - </cell> - <cell class="help"> + </column> + <column class="help"> <link type="url" url="var:orderbytype_url" title="message:FOLDER_ORDERBYTYPE"> <text key="GLOBAL_TYPE"></text> </link> @@ -18,16 +18,16 @@ <link type="url" url="var:orderbyname_url" title="message:FOLDER_ORDERBYNAME"> <text key="GLOBAL_NAME"></text> </link> - </cell> - <cell class="help"> + </column> + <column class="help"> <link type="url" url="var:orderbylastchange_url" title="message:FOLDER_ORDERBYLASTCHANGE"> <text key="GLOBAL_LASTCHANGE"></text> </link> - </cell> + </column> </row> <list list="object" extract="true"> <row class="data" id="o_{id}"> - <cell width="3%"> + <column width="3%"> <if present="upurl"> <link type="url" url="var:upurl" title="GLOBAL_UP"> <set var="bild" value="arrow_up"></set> @@ -37,8 +37,8 @@ <if empty="upurl"> <text raw="_"></text> </if> - </cell> - <cell width="3%"> + </column> + <column width="3%"> <if present="topurl"> <link type="url" url="var:topurl" title="GLOBAL_TOP"> <set var="bild" value="arrow_top"></set> @@ -48,8 +48,8 @@ <if empty="topurl"> <text raw="_"></text> </if> - </cell> - <cell width="3%"> + </column> + <column width="3%"> <if present="bottomurl"> <link type="url" url="var:bottomurl" title="GLOBAL_BOTTOM"> <set var="bild" value="arrow_bottom"></set> @@ -59,8 +59,8 @@ <if empty="bottomurl"> <text raw="_"></text> </if> - </cell> - <cell width="3%"> + </column> + <column width="3%"> <if present="downurl"> <link type="url" url="var:downurl" title="GLOBAL_DOWN"> <set var="bild" value="arrow_down"></set> @@ -70,14 +70,14 @@ <if empty="downurl"> <text raw="_"></text> </if> - </cell> - <cell width="40%"> + </column> + <column width="40%"> <image type="var:icon"></image> <text var="name"></text> - </cell> - <cell width="18%"> + </column> + <column width="18%"> <date date="var:date"></date> - </cell> + </column> </row> </list> </table> diff --git a/themes/default/templates/folder/preview.tpl.src.xml b/themes/default/templates/folder/preview.tpl.src.xml @@ -0,0 +1,47 @@ +<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"> + <table> + <row class="headline"> + <column class="help"> + <text key="GLOBAL_TYPE"></text> + <text raw="_/_"></text> + <text key="GLOBAL_NAME"></text> + </column> + <column class="help"> + <text key="GLOBAL_LASTCHANGE"></text> + </column> + </row> + <if present="up_url"> + <row class="data"> + <column url="var:up_url"> + <image type="folder_up"></image> + <text raw=".."></text> + </column> + <column> + <text raw=""></text> + </column> + </row> + </if> + <list list="object" extract="true"> + <row class="data"> + <column id="var:id" name="var:name" action="var:type" title="var:desc" + class="var:class"> + <image type="var:icon"></image> + <text var="name"></text> + <text raw="_"></text> + </column> + <column> + <date date="var:date"></date> + </column> + </row> + </list> + <if empty="object"> + <row> + <column colspan="2"> + <text text="GLOBAL_NOT_FOUND"></text> + </column> + </row> + </if> + + </table> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/folder/prop.tpl.src.xml b/themes/default/templates/folder/prop.tpl.src.xml @@ -3,7 +3,7 @@ <header></header> <form> - <fieldset title="message:GLOBAL_PROP"> + <group title="message:GLOBAL_PROP"> <part class="line"> <part class="label"> <label for="name" key="global_name" /> @@ -29,6 +29,6 @@ <inputarea name="description" class="description"></inputarea> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/folder/pub.tpl.src.xml b/themes/default/templates/folder/pub.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <fieldset title="message:publish"> + <group title="message:publish"> <if present="pages"> <if present="subdirs"> @@ -34,8 +34,8 @@ </if> </if> - </fieldset> - <fieldset title="message:options"> + </group> + <group title="message:options"> <if present="subdirs"> <part class="line"> <part class="label"> @@ -62,7 +62,7 @@ </part> </part> </if> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/folder/remove.tpl.src.xml b/themes/default/templates/folder/remove.tpl.src.xml @@ -1,3 +1,3 @@ <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="group" name="GLOBAL_GROUPS"><row><cell><text text="GLOBAL_NAME"></text></cell><cell><text var="name"></text></cell></row><row><cell><text text="GLOBAL_DELETE"></text></cell><cell><checkbox name="delete"></checkbox></cell></row><row><cell colspan="2" class="help"><text text="GROUP_DELETE_DESC"></text></cell></row><row><cell colspan="2"><button type="ok"></button></cell></row></window></form><focus field="delete"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window icon="group" name="GLOBAL_GROUPS"><row><column><text text="GLOBAL_NAME"></text></column><column><text var="name"></text></column></row><row><column><text text="GLOBAL_DELETE"></text></column><column><checkbox name="delete"></checkbox></column></row><row><column colspan="2" class="help"><text text="GROUP_DELETE_DESC"></text></column></row><row><column colspan="2"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/folder/select.tpl.src.xml b/themes/default/templates/folder/select.tpl.src.xml @@ -7,66 +7,66 @@ <window> <table> <row> - <cell class="help"> + <column class="help"> <text raw="_"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="GLOBAL_NAME"></text> - </cell> + </column> </row> <list list="objectlist" extract="true"> <row class="data"> - <cell> + <column> <image icon="var:type"></image> - </cell> - <cell> + </column> + <column> <text var="name"></text> <text raw="_"></text> - </cell> + </column> </row> </list> <if present="folder"> <row> - <cell colspan="2"> - <fieldset title="message:folder_select_target_folder"></fieldset> - </cell> + <column colspan="2"> + <group title="message:folder_select_target_folder"></group> + </column> </row> <list list="folder"> <row class="data"> - <cell> + <column> <radio name="targetobjectid" value="var:list_key"></radio> - </cell> - <cell> + </column> + <column> <label for="targetobjectid_{list_key}"> <text var="list_value"></text> </label> - </cell> + </column> </row> </list> </if> <if present="ask_filename"> <row> - <cell colspan="2"> + <column colspan="2"> <input name="filename"></input> - </cell> + </column> </row> </if> <if present="ask_commit"> <row> - <cell colspan="2"> - <fieldset title="message:options"> + <column colspan="2"> + <group title="message:options"> <checkbox name="commit"></checkbox> <label for="commit"> <text key="FOLDER_SELECT_DELETE_COMMIT"></text> </label> - </fieldset> - </cell> + </group> + </column> </row> </if> <row> - <cell class="act" colspan="2"> + <column class="act" colspan="2"> <button type="ok"></button> - </cell> + </column> </row> </table> </window> diff --git a/themes/default/templates/folder/show.tpl.src.xml b/themes/default/templates/folder/show.tpl.src.xml @@ -2,76 +2,76 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell class="help"> + <column class="help"> <text key="GLOBAL_TYPE"></text> <text raw="_/_"></text> <text key="GLOBAL_NAME"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text key="GLOBAL_LASTCHANGE"></text> - </cell> + </column> </row> <if present="up_url"> <row class="data"> - <cell url="var:up_url"> + <column url="var:up_url"> <image type="folder"></image> <text raw=".."></text> - </cell> - <cell> + </column> + <column> <text raw=""></text> - </cell> + </column> </row> </if> <list list="object" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="var:type" title="var:desc" class="var:class"> + <column id="var:id" name="var:name" action="var:type" title="var:desc" class="var:class"> <image type="var:icon"></image> <text var="name"></text> <text raw="_"></text> - </cell> - <cell> + </column> + <column> <date date="var:date"></date> - </cell> + </column> </row> </list> <if empty="object"> <row> - <cell colspan="2"> + <column colspan="2"> <text text="GLOBAL_NOT_FOUND"></text> - </cell> + </column> </row> </if> <row class="data"> - <cell colspan="2"> + <column colspan="2"> <link type="view" action="folder" subaction="createfolder"> <image file="icon/create"></image> <text key="menu_folder_createfolder"></text> </link> - </cell> + </column> </row> <row class="data"> - <cell colspan="2"> + <column colspan="2"> <link type="view" action="folder" subaction="createpage"> <image file="icon/create"></image> <text key="menu_folder_createpage"></text> </link> - </cell> + </column> </row> <row class="data"> - <cell colspan="2"> + <column colspan="2"> <link type="view" action="folder" subaction="createfile"> <image file="icon/create"></image> <text key="menu_folder_createfile"></text> </link> - </cell> + </column> </row> <row class="data"> - <cell colspan="2"> + <column colspan="2"> <link type="modal" action="folder" subaction="createlink"> <image file="icon/create"></image> <text key="menu_folder_createlink"></text> </link> - </cell> + </column> </row> </table> </output> \ No newline at end of file diff --git a/themes/default/templates/folder/structure.tpl.src.xml b/themes/default/templates/folder/structure.tpl.src.xml @@ -0,0 +1,7 @@ +<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"> + <part class="structure tree"> + <tree tree="var:outline"></tree> + </part> + +</output>+ \ No newline at end of file diff --git a/themes/default/templates/group/listing.tpl.src.xml b/themes/default/templates/group/listing.tpl.src.xml @@ -1,3 +1,3 @@ <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><window><table><row class="headline"><cell><text key="name"></text></cell></row><list list="el" extract="true"><row class="data"><cell url="var:url"><image file="icon_group"></image><text var="name"></text></cell></row></list><row><cell><link class="action" action="group" subaction="add"><text key="menu_group_add"></text></link></cell></row></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window><table><row class="headline"><column><text key="name"></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><image file="icon_group"></image><text var="name"></text></column></row></list><row><column><link class="action" action="group" subaction="add"><text key="menu_group_add"></text></link></column></row></table></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/group/memberships.tpl.src.xml b/themes/default/templates/group/memberships.tpl.src.xml @@ -1,3 +1,3 @@ <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><window icon="user" name="GROUP_MEMBERSHIPS"><table><row class="headline"><cell width="10%"></cell><cell><text key="name"></text></cell></row><list list="memberships" extract="true"><row class="data"><cell><checkbox name="var:var"></checkbox></cell><cell><label for="var:var"><image file="icon_user"></image><text var="name"></text></label></cell></row></list></table><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><form><window icon="user" name="GROUP_MEMBERSHIPS"><table><row class="headline"><column width="10%"></column><column><text key="name"></text></column></row><list list="memberships" extract="true"><row class="data"><column><checkbox name="var:var"></checkbox></column><column><label for="var:var"><image file="icon_user"></image><text var="name"></text></label></column></row></list></table><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form></output>+ \ No newline at end of file diff --git a/themes/default/templates/group/remove.tpl.src.xml b/themes/default/templates/group/remove.tpl.src.xml @@ -1,3 +1,3 @@ <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><part class="line"><part class="label"><label key="GLOBAL_NAME"></label></part><part class="input"><text var="name"></text></part></part><fieldset title="message:options"></fieldset><part class="line"><part class="label"></part><part class="input"><checkbox name="confirm"></checkbox><label for="confirm" key="GROUP_DELETE"></label></part></part></form></header></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><header back="true"><form><part class="line"><part class="label"><label key="GLOBAL_NAME"></label></part><part class="input"><text var="name"></text></part></part><group title="message:options"></group><part class="line"><part class="label"></part><part class="input"><checkbox name="confirm"></checkbox><label for="confirm" key="GROUP_DELETE"></label></part></part></form></header></output>+ \ No newline at end of file diff --git a/themes/default/templates/group/rights.tpl.src.xml b/themes/default/templates/group/rights.tpl.src.xml @@ -1,3 +1,3 @@ <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><window><list list="projects" extract="true"><row><cell><fieldset title="var:projectname"><if empty="acls"><row><cell><text text="GLOBAL_NOT_FOUND"></text></cell></row></if><if not="true" empty="acls"><table><row class="headline"><cell class="help"><text text="GLOBAL_USER"></text></cell><cell class="help"><text text="GLOBAL_NAME"></text></cell><cell class="help"><text text="GLOBAL_LANGUAGE"></text></cell><list list="show" value="t"><cell class="help"><text key="var:t" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text></cell></list></row><list list="rights" key="aclid" value="acl" extract="true"><row class="data"><cell><if present="groupname"><image type="group"></image><text var="groupname" maxlength="20"></text></if><if not="true" present="username"><if not="true" present="groupname"><image type="group"></image><text key="global_all"></text></if></if><set var="username"></set><set var="groupname"></set></cell><cell><image type="var:objecttype"></image><link action="var:objecttype" subaction="" id="var:objectid"><text var="objectname" maxlength="20" title="message:select"></text></link></cell><cell><text var="languagename" maxlength="20"></text></cell><list list="show"><cell><set var="var:list_value" value="var:bits" key="var:list_value"></set><checkbox name="var:list_value" readonly="true"></checkbox></cell></list></row></list></table></if></fieldset></cell></row></list></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window><list list="projects" extract="true"><row><column><group title="var:projectname"><if empty="acls"><row><column><text text="GLOBAL_NOT_FOUND"></text></column></row></if><if not="true" empty="acls"><table><row class="headline"><column class="help"><text text="GLOBAL_USER"></text></column><column class="help"><text text="GLOBAL_NAME"></text></column><column class="help"><text text="GLOBAL_LANGUAGE"></text></column><list list="show" value="t"><column class="help"><text key="var:t" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text></column></list></row><list list="rights" key="aclid" value="acl" extract="true"><row class="data"><column><if present="groupname"><image type="group"></image><text var="groupname" maxlength="20"></text></if><if not="true" present="username"><if not="true" present="groupname"><image type="group"></image><text key="global_all"></text></if></if><set var="username"></set><set var="groupname"></set></column><column><image type="var:objecttype"></image><link action="var:objecttype" subaction="" id="var:objectid"><text var="objectname" maxlength="20" title="message:select"></text></link></column><column><text var="languagename" maxlength="20"></text></column><list list="show"><column><set var="var:list_value" value="var:bits" key="var:list_value"></set><checkbox name="var:list_value" readonly="true"></checkbox></column></list></row></list></table></if></group></column></row></list></window></dummy></output>+ \ 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 @@ -2,25 +2,25 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell> + <column> <text key="name"></text> - </cell> + </column> </row> <list list="el" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="group">> + <column id="var:id" name="var:name" action="group">> <image file="icon_group"></image> <text var="name"></text> - </cell> + </column> </row> </list> <row class="data"> - <cell colspan="2"> + <column colspan="2"> <link type="view" subaction="add"> <image icon="add"/> <text text="new"/> </link> - </cell> + </column> </row> </table> </output> \ No newline at end of file diff --git a/themes/default/templates/language/listing.tpl.src.xml b/themes/default/templates/language/listing.tpl.src.xml @@ -1,3 +1,3 @@ <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><window icon="language"><table><row class="headline"><cell><text key="name"></text></cell><cell><text raw=""></text></cell><cell><text raw=""></text></cell><cell><text raw=""></text></cell></row><list list="el" extract="true"><row class="data"><cell url="var:url"><image file="icon_language"></image><text var="name" maxlength="25"></text></cell><cell><text var="isocode"></text></cell><cell url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></cell><cell url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></cell></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window icon="language"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><image file="icon_language"></image><text var="name" maxlength="25"></text></column><column><text var="isocode"></text></column><column url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></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 @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true" /> <form method="post"> - <fieldset> + <group> <part class="line"> <part class="label"> <text text="GLOBAL_NAME"></text> @@ -11,9 +11,9 @@ <text var="name"></text> </part> </part> - </fieldset> + </group> - <fieldset title="message:options"> + <group title="message:options"> <part class="line"> <part class="label"> @@ -25,7 +25,7 @@ </label> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/language/structure.tpl.src.xml b/themes/default/templates/language/structure.tpl.src.xml @@ -0,0 +1,7 @@ +<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"> + <part class="structure tree"> + <tree tree="var:outline"></tree> + </part> + +</output>+ \ No newline at end of file diff --git a/themes/default/templates/languagelist/show.tpl.src.xml b/themes/default/templates/languagelist/show.tpl.src.xml @@ -2,63 +2,63 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell> + <column> <text key="NAME"></text> - </cell> - <cell> + </column> + <column> <text key="LANGUAGE_ISOCODE"></text> - </cell> - <cell> + </column> + <column> <text raw=""></text> - </cell> - <cell> + </column> + <column> <text raw=""></text> - </cell> + </column> </row> <list list="el" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="language"> + <column id="var:id" name="var:name" action="language"> <image file="icon_language"></image> <text var="name" maxlength="25"></text> - </cell> - <cell> + </column> + <column> <text var="isocode"></text> - </cell> + </column> <if present="default_url"> - <cell> + <column> <link type="post" action="language" subaction="setdefault" id="var:id"> <text text="GLOBAL_make_default"></text> </link> - </cell> + </column> </if> <else> - <cell> + <column> <text text="GLOBAL_is_default"></text> - </cell> + </column> </else> <if present="select_url"> - <cell> + <column> <link type="post" action="start" subaction="language" id="var:id"> <text text="GLOBAL_select"></text> </link> - </cell> + </column> </if> <else> - <cell> + <column> <text text="GLOBAL_selected"></text> - </cell> + </column> </else> </row> <set var="select_url"></set> <set var="default_url"></set> </list> <row class="data"> - <cell colspan="4"> + <column colspan="4"> <link type="view" subaction="add"> <image icon="add"/> <text text="new"/> </link> - </cell> + </column> </row> </table> </output> \ No newline at end of file diff --git a/themes/default/templates/link/edit.tpl.src.xml b/themes/default/templates/link/edit.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <fieldset> + <group> <part class="line"> <part class="label"> <radio name="type" value="url"></radio> @@ -26,6 +26,6 @@ </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/link/info.tpl.src.xml b/themes/default/templates/link/info.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <fieldset title="message:global_prop"> + <group title="message:global_prop"> <part class="line"> <part class="label"> <text text="GLOBAL_name"></text> @@ -19,9 +19,9 @@ <text var="description" class="description" /> </part> </part> - </fieldset> + </group> - <fieldset title="message:additional_info"> + <group title="message:additional_info"> <part class="line"> <part class="label"> <label for="objectid"> @@ -32,9 +32,9 @@ <text var="objectid"></text> </part> </part> - </fieldset> + </group> - <fieldset title="message:prop_userinfo"> + <group title="message:prop_userinfo"> <part class="line"> <part class="label"> <label for=""> @@ -63,6 +63,6 @@ <user user="var:lastchange_user"></user> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/link/prop.tpl.src.xml b/themes/default/templates/link/prop.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <fieldset title="message:global_prop"> + <group title="message:global_prop"> <part class="line"> <part class="label"> <label for="name"> @@ -23,7 +23,7 @@ <inputarea name="description" class="description"></inputarea> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/link/structure.tpl.src.xml b/themes/default/templates/link/structure.tpl.src.xml @@ -0,0 +1,7 @@ +<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"> + <part class="structure tree"> + <tree tree="var:outline"></tree> + </part> + +</output>+ \ No newline at end of file diff --git a/themes/default/templates/login/changepassword.tpl.src.xml b/themes/default/templates/login/changepassword.tpl.src.xml @@ -1,3 +1,3 @@ <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 target="_top"><window title="GLOBAL_CHOOSE" name="login" width="400" icon="user" columnclasses="x,y" rowclasses="fx1,fx2"><row><cell class="logo" colspan="2"><logo name="changepassword"></logo></cell><row><cell width="50%"><text text="USER_PASSWORD"></text></cell><cell width="50%"><password name="password_old" default="" size="25"></password></cell></row><row><cell width="50%"><text text="USER_NEW_PASSWORD"></text></cell><cell width="50%"><password name="password_new_1" default="" size="25"></password></cell></row><row><cell width="50%"><text text="USER_NEW_PASSWORD_REPEAT"></text></cell><cell width="50%"><password name="password_new_2" default="" size="25"></password></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></row></window></form><focus field="password_old"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form target="_top"><window title="GLOBAL_CHOOSE" name="login" width="400" icon="user" columnclasses="x,y" rowclasses="fx1,fx2"><row><column class="logo" colspan="2"><logo name="changepassword"></logo></column><row><column width="50%"><text text="USER_PASSWORD"></text></column><column width="50%"><password name="password_old" default="" size="25"></password></column></row><row><column width="50%"><text text="USER_NEW_PASSWORD"></text></column><column width="50%"><password name="password_new_1" default="" size="25"></password></column></row><row><column width="50%"><text text="USER_NEW_PASSWORD_REPEAT"></text></column><column width="50%"><password name="password_new_2" default="" size="25"></password></column></row><row><column colspan="2" class="act"><button type="ok"></button></column></row></row></window></form><focus field="password_old"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/login/license.tpl.src.xml b/themes/default/templates/login/license.tpl.src.xml @@ -1,3 +1,3 @@ <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><header><link type="external" url="config:login/gpl/url" target="_top" class="copyright"><text key="GPL"></text></link><fieldset></fieldset><list list="software" extract="true"><link type="external" url="var:url"><text var="name"></text></link><text var="license"></text><newline></newline><newline></newline></list></header></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><header><link type="external" url="config:login/gpl/url" target="_top" class="copyright"><text key="GPL"></text></link><group></group><list list="software" extract="true"><link type="external" url="var:url"><text var="name"></text></link><text var="license"></text><newline></newline><newline></newline></list></header></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/login/login.tpl.src.xml b/themes/default/templates/login/login.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="password"></header> <form action="login" subaction="login" target="_top"> - <fieldset> + <group> <if present="config:login/logo/file"> <if false="property:mustChangePassword"> <if present="config:login/logo/url"> @@ -57,9 +57,9 @@ </part> </part> </if> - </fieldset> + </group> <if true="property:mustChangePassword"> - <fieldset title="message:USER_NEW_PASSWORD"> + <group title="message:USER_NEW_PASSWORD"> <part class="line"> <part class="label"> <label for="password1"> @@ -80,7 +80,7 @@ <password name="password2" default="" size="25"></password> </part> </part> - </fieldset> + </group> </if> <link type="view" class="action" action="login" subaction="password"> <text key="menu_password"></text> @@ -95,7 +95,7 @@ <newline></newline> <if value="size:dbids" greaterthan="1"> - <fieldset title="message:DATABASE" icon="database"> + <group title="message:DATABASE" icon="database"> <part class="line"> <part class="label"> <label for="dbid"> @@ -107,7 +107,7 @@ <hidden name="screenwidth" default="9999"></hidden> </part> </part> - </fieldset> + </group> </if> <else> <hidden name="dbid" default="var:actdbid"></hidden> diff --git a/themes/default/templates/login/openid.tpl.src.xml b/themes/default/templates/login/openid.tpl.src.xml @@ -5,7 +5,7 @@ <!-- Open-Id --> <if true="config:security/openid/enable"> - <fieldset title="message:OPENID"> + <group title="message:OPENID"> <part class="line"> <part class="label"> <text key="openid_user"></text> @@ -21,11 +21,11 @@ </if> </part> </part> - </fieldset> + </group> </if> <if value="size:dbids" greaterthan="1"> - <fieldset title="message:DATABASE" icon="database"> + <group title="message:DATABASE" icon="database"> <part class="line"> <part class="label"> <label for="dbid"> @@ -37,7 +37,7 @@ <hidden name="screenwidth" default="9999"></hidden> </part> </part> - </fieldset> + </group> </if> <else> <hidden name="dbid" default="var:actdbid"></hidden> diff --git a/themes/default/templates/login/passwordinputcode.tpl.src.xml b/themes/default/templates/login/passwordinputcode.tpl.src.xml @@ -1,3 +1,3 @@ <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 target="_top"><window name="password" icon="user" width="400px" widths="50%,50%"><row><cell class="logo" colspan="2"><logo name="password"></logo></cell><row><cell><text text="mail_code"></text></cell><cell><input type="text" name="code" size="30"></input></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></row></window></form><focus field="code"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form target="_top"><window name="password" icon="user" width="400px" widths="50%,50%"><row><column class="logo" colspan="2"><logo name="password"></logo></column><row><column><text text="mail_code"></text></column><column><input type="text" name="code" size="30"></input></column></row><row><column colspan="2" class="act"><button type="ok"></button></column></row></row></window></form><focus field="code"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/model/listing.tpl.src.xml b/themes/default/templates/model/listing.tpl.src.xml @@ -1,3 +1,3 @@ <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><window icon="group" name="GLOBAL_MODELS" widths="50%,25%,25%"><table><row class="headline"><cell><text key="name"></text></cell><cell><text raw=""></text></cell><cell><text raw=""></text></cell></row><list list="el" extract="true"><row class="data"><cell url="var:url"><link target="cms_main"><image file="icon_model"></image><text var="name" maxlength="25"></text></link></cell><cell url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></cell><cell url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></cell></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window icon="group" name="GLOBAL_MODELS" widths="50%,25%,25%"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><link target="cms_main"><image file="icon_model"></image><text var="name" maxlength="25"></text></link></column><column url="var:default_url"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="var:select_url"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/model/remove.tpl.src.xml b/themes/default/templates/model/remove.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true"></header> <form method="post"> - <fieldset> + <group> <part class="line"> <part class="label"> <text text="GLOBAL_NAME"></text> @@ -11,8 +11,8 @@ <text var="name" class="name"></text> </part> </part> - </fieldset> - <fieldset title="message:options"> + </group> + <group title="message:options"> <part class="line"> <part class="label"> </part> @@ -24,6 +24,6 @@ </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/model/structure.tpl.src.xml b/themes/default/templates/model/structure.tpl.src.xml @@ -0,0 +1,7 @@ +<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"> + <part class="structure tree"> + <tree tree="var:outline"></tree> + </part> + +</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 @@ -2,60 +2,60 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell> + <column> <text key="name"></text> - </cell> - <cell> + </column> + <column> <text raw=""></text> - </cell> - <cell> + </column> + <column> <text raw=""></text> - </cell> + </column> </row> <list list="el" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="model"> + <column id="var:id" name="var:name" action="model"> <image file="icon_model"></image> <text var="name" maxlength="25"></text> - </cell> + </column> <if present="default_url"> - <cell> + <column> <link type="post" action="model" subaction="setdefault" id="var:id"> <text text="GLOBAL_make_default"></text> </link> - </cell> + </column> </if> <else> - <cell> + <column> <text text="GLOBAL_is_default"></text> - </cell> + </column> </else> <if present="select_url"> - <cell> + <column> <link type="post" action="start" subaction="model" id="var:id"> <text text="GLOBAL_select"></text> </link> - </cell> + </column> </if> <else> - <cell> + <column> <text text="GLOBAL_selected"></text> - </cell> + </column> </else> </row> <set var="select_url"></set> <set var="default_url"></set> </list> <row class="data"> - <cell colspan="3"> + <column colspan="3"> <link type="view" subaction="add"> <image icon="add"/> <text text="new"/> </link> - </cell> + </column> </row> </table> </output> \ No newline at end of file diff --git a/themes/default/templates/object/aclform.tpl.src.xml b/themes/default/templates/object/aclform.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true" /> <form> - <fieldset title="message:users"> + <group title="message:users"> <part class="line"> <part class="label"> <radio name="type" value="all"></radio> @@ -37,9 +37,9 @@ </part> </part> </if> - </fieldset> + </group> - <fieldset title="message:language"> + <group title="message:language"> <part class="line"> <part class="label"> <label for="languageid"> @@ -51,9 +51,9 @@ <selectbox name="languageid" list="languages"></selectbox> </part> </part> - </fieldset> + </group> - <fieldset title="message:acl"> + <group title="message:acl"> <part class="line"> <part class="label"> </part> @@ -73,6 +73,6 @@ </list> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/object/inherit.tpl.src.xml b/themes/default/templates/object/inherit.tpl.src.xml @@ -4,7 +4,7 @@ <form> <if value="var:type" equals="folder"> - <fieldset title="message:options"> + <group title="message:options"> <part class="line"> <part class="label"> </part> @@ -16,7 +16,7 @@ </label> </part> </part> - </fieldset> + </group> </if> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/object/rights.tpl.src.xml b/themes/default/templates/object/rights.tpl.src.xml @@ -10,32 +10,32 @@ <table> <row class="headline"> - <cell class="help"> + <column class="help"> <text key="GLOBAL_NAME"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text key="GLOBAL_LANGUAGE"></text> - </cell> + </column> <list list="show" value="t"> - <cell class="help"> + <column class="help"> <text key="var:t" prefix="acl_" suffix="_abbrev"></text> - </cell> + </column> </list> - <cell class="help"> + <column class="help"> <text key="global_delete"></text> - </cell> + </column> </row> <if empty="acls"> <row class="data"> - <cell> + <column> <text text="GLOBAL_NOT_FOUND"></text> - </cell> + </column> </row> </if> <if not="true" empty="acls"></if> <list list="acls" key="aclid" value="acl" extract="true"> <row class="data"> - <cell> + <column> <if present="username"> <image type="user"></image> <text var="username"></text> @@ -50,20 +50,20 @@ <text key="global_all"></text> </if> </if> - </cell> - <cell> + </column> + <column> <text var="languagename"></text> - </cell> + </column> <list list="show" value="t"> - <cell> + <column> <checkbox name="var:t" default="false" readonly="true"></checkbox> - </cell> + </column> </list> - <cell> + <column> <link type="post" subaction="delacl" id="var:aclid"> <text key="GLOBAL_DELETE"></text> </link> - </cell> + </column> </row> </list> </table> diff --git a/themes/default/templates/page/el.tpl.src.xml b/themes/default/templates/page/el.tpl.src.xml @@ -3,37 +3,37 @@ <table> <if not="" empty="el"> <row class="headline"> - <cell class="help"> + <column class="help"> <text text="PAGE_ELEMENT_NAME"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="PAGE_ELEMENT_VALUE"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="GLOBAL_ARCHIVE"></text> - </cell> + </column> </row> </if> <if empty="el"> <row> - <cell> + <column> <text text="GLOBAL_NOT_FOUND"></text> - </cell> + </column> </row> </if> <list list="el" extract="true"> <row class="data"> - <cell> + <column> <link url="var:url" title="var:desc"> <image elementtype="var:type" align="left"></image> <text var="name"></text> </link> - </cell> - <cell> + </column> + <column> <text var="value"></text> <text raw="_"></text> - </cell> - <cell> + </column> + <column> <if present="archive_url"> <link url="var:archive_url" title="message:GLOBAL_ARCHIVE_DESC"> <text text="GLOBAL_ARCHIVE"></text> @@ -45,13 +45,13 @@ <else><text text="GLOBAL_NO_ARCHIVE" type="emphatic" title="message:GLOBAL_NO_ARCHIVE_DESC"></text></else> <set var="archive_url"></set> - </cell> + </column> </row> </list> <row> - <cell class="help" colspan="3"> + <column class="help" colspan="3"> <text text="PAGE_ELEMENTS_DESC"></text> - </cell> + </column> </row> </table> <link action="page" subaction="form" title="message:menu_page_form_desc" diff --git a/themes/default/templates/page/form.tpl.src.xml b/themes/default/templates/page/form.tpl.src.xml @@ -1,3 +1,3 @@ <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><table><if empty="el"><row><cell colspan="4"><text text="GLOBAL_NOT_FOUND"></text></cell></row></if><if not="" empty="el"><row><cell class="help"><text text="PAGE_ELEMENT_NAME"></text></cell><cell class="help"><text text="GLOBAL_CHANGE"></text></cell><cell class="help"><text text="GLOBAL_VALUE"></text></cell></row><list list="el" extract="true"><row class="data"><cell><label for="var:saveid"><image elementtype="var:type"></image><text var="name"></text></label></cell><cell><checkbox name="var:saveid" default="false" readonly="false"></checkbox></cell><cell><if value="var:type" contains="text,date,number"><input index="true" type="text" name="var:id" default="var:value" size="40" maxlength="255" onchange="onchange"></input></if><if value="var:type" equals="longtext"><inputarea index="true" name="var:id" rows="7" cols="50" onchange="onchange" default="var:value"></inputarea></if><if value="var:type" contains="select,link,list"><selectbox name="var:id" list="list" default="var:value"></selectbox></if></cell></row></list></if></table><fieldset title="message:options"><if present="release"><part><checkbox name="release"></checkbox><label for="release"><text raw="_"></text><text text="GLOBAL_RELEASE"></text></label></part></if><if present="publish"><part><checkbox name="publish"></checkbox><label for="publish"><text raw="_"></text><text text="PAGE_PUBLISH_AFTER_SAVE"></text></label></part></if></fieldset><button type="ok"></button></window></form></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window><table><if empty="el"><row><column colspan="4"><text text="GLOBAL_NOT_FOUND"></text></column></row></if><if not="" empty="el"><row><column class="help"><text text="PAGE_ELEMENT_NAME"></text></column><column class="help"><text text="GLOBAL_CHANGE"></text></column><column class="help"><text text="GLOBAL_VALUE"></text></column></row><list list="el" extract="true"><row class="data"><column><label for="var:saveid"><image elementtype="var:type"></image><text var="name"></text></label></column><column><checkbox name="var:saveid" default="false" readonly="false"></checkbox></column><column><if value="var:type" contains="text,date,number"><input index="true" type="text" name="var:id" default="var:value" size="40" maxlength="255" onchange="onchange"></input></if><if value="var:type" equals="longtext"><inputarea index="true" name="var:id" rows="7" cols="50" onchange="onchange" default="var:value"></inputarea></if><if value="var:type" contains="select,link,list"><selectbox name="var:id" list="list" default="var:value"></selectbox></if></column></row></list></if></table><group title="message:options"><if present="release"><part><checkbox name="release"></checkbox><label for="release"><text raw="_"></text><text text="GLOBAL_RELEASE"></text></label></part></if><if present="publish"><part><checkbox name="publish"></checkbox><label for="publish"><text raw="_"></text><text text="PAGE_PUBLISH_AFTER_SAVE"></text></label></part></if></group><button type="ok"></button></window></form></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/page/info.tpl.src.xml b/themes/default/templates/page/info.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="changetemplate"></header> <form> - <fieldset> + <group> <part class="line"> <part class="label"> <text text="global_name"></text> @@ -27,9 +27,9 @@ <text var="description" class="description" /> </part> </part> - </fieldset> + </group> <if false="mode:edit"> - <fieldset title="message:additional_info"> + <group title="message:additional_info"> <part class="line"> <part class="label"> <label for="full_filename"> @@ -86,8 +86,8 @@ <text var="objectid"></text> </part> </part> - </fieldset> - <fieldset title="message:prop_userinfo"> + </group> + <group title="message:prop_userinfo"> <part class="line"> <part class="label"> <label for="create_date"> @@ -116,7 +116,7 @@ <user user="var:lastchange_user"></user> </part> </part> - </fieldset> + </group> </if> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/page/preview.tpl.src.xml b/themes/default/templates/page/preview.tpl.src.xml @@ -0,0 +1,20 @@ +<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="el"></header> + <group title="message:menu_page_show"> + <part> + <insert url="var:preview_url" name="preview"></insert> + </part> + </group> + <link class="action" action="page" subaction="preview" target="preview"> + <image icon="show"></image> + <text key="menu_page_show"></text> + </link> + <link class="action" action="page" subaction="edit" target="preview"> + <image icon="show"></image> + <text key="menu_page_edit"></text> + </link> + <link type="popup" class="action" url="var:preview_url"> + <text key="link_open_in_new_window"></text> + </link> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/page/prop.tpl.src.xml b/themes/default/templates/page/prop.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="changetemplate"></header> <form> - <fieldset> + <group> <part class="line"> <part class="label"> <label for="name"> @@ -33,9 +33,9 @@ <inputarea name="description" class="description"></inputarea> </part> </part> - </fieldset> + </group> <if false="mode:edit"> - <fieldset title="message:additional_info"> + <group title="message:additional_info"> <part class="line"> <part class="label"> <label for="full_filename"> @@ -92,8 +92,8 @@ <text var="objectid"></text> </part> </part> - </fieldset> - <fieldset title="message:prop_userinfo"> + </group> + <group title="message:prop_userinfo"> <part class="line"> <part class="label"> <label for="create_date"> @@ -122,7 +122,7 @@ <user user="var:lastchange_user"></user> </part> </part> - </fieldset> + </group> </if> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/page/pub.tpl.src.xml b/themes/default/templates/page/pub.tpl.src.xml @@ -1,7 +1,7 @@ <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> - <fieldset title="message:options"> + <group title="message:options"> <part class="line"> <part class="label"> @@ -14,6 +14,6 @@ </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/page/show.tpl.src.xml b/themes/default/templates/page/show.tpl.src.xml @@ -1,20 +0,0 @@ -<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="el"></header> - <fieldset title="message:menu_page_show"> - <part> - <insert url="var:preview_url" name="preview"></insert> - </part> - </fieldset> - <link class="action" action="page" subaction="preview" target="preview"> - <image icon="show"></image> - <text key="menu_page_show"></text> - </link> - <link class="action" action="page" subaction="edit" target="preview"> - <image icon="show"></image> - <text key="menu_page_edit"></text> - </link> - <link type="popup" class="action" url="var:preview_url"> - <text key="link_open_in_new_window"></text> - </link> -</output>- \ No newline at end of file diff --git a/themes/default/templates/page/src.tpl.src.xml b/themes/default/templates/page/src.tpl.src.xml @@ -1,3 +1,3 @@ <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><window icon="page"><row><cell><text var="src" escape="false" type="preformatted"></text></cell></row></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window icon="page"><row><column><text var="src" escape="false" type="preformatted"></text></column></row></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/page/structure.tpl.src.xml b/themes/default/templates/page/structure.tpl.src.xml @@ -0,0 +1,7 @@ +<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"> + <part class="structure tree"> + <tree tree="var:outline"></tree> + </part> + +</output>+ \ No newline at end of file diff --git a/themes/default/templates/pageelement/archive.tpl.src.xml b/themes/default/templates/pageelement/archive.tpl.src.xml @@ -3,84 +3,84 @@ <form method="get" subaction="diff"> <table widths="5%,5%,5%,15%,15%,35%,10%,10%"> <row class="headline"> - <cell class="help"> + <column class="help"> <text text="GLOBAL_NR"></text> - </cell> - <cell class="help" colspan="2"> + </column> + <column class="help" colspan="2"> <if present="compareid"> <text text="GLOBAL_COMPARE"></text> </if> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="DATE"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="GLOBAL_USER"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="GLOBAL_VALUE"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="GLOBAL_STATE"></text> - </cell> - <cell class="help"> + </column> + <column class="help"> <text text="GLOBAL_ACTION"></text> - </cell> + </column> </row> <if empty="el"> <row> - <cell colspan="8"> + <column colspan="8"> <text text="GLOBAL_NOT_FOUND"></text> - </cell> + </column> </row> </if> <list list="el" extract="true"> <row class="data"> - <cell> + <column> <text var="lfd_nr"></text> - </cell> - <cell> + </column> + <column> <if present="compareid"> <radio name="compareid" value="var:id"></radio> </if> - </cell> - <cell> + </column> + <column> <if present="compareid"> <radio name="withid" value="var:id"></radio> </if> - </cell> - <cell> + </column> + <column> <date date="var:date"></date> - </cell> - <cell> + </column> + <column> <text var="user"></text> - </cell> - <cell> + </column> + <column> <text var="value"></text> - </cell> - <cell> + </column> + <column> <if true="var:public"> <text key="GLOBAL_PUBLIC" type="strong"></text> </if> <else><if present="releaseUrl"><link url="var:releaseUrl" title="message:GLOBAL_RELEASE_DESC"><text key="GLOBAL_RELEASE" type="strong"></text></link></if><else><text key="GLOBAL_INACTIVE" type="emphatic"></text></else></else> - </cell> - <cell> + </column> + <column> <if true="var:active"> <text key="GLOBAL_ACTIVE" type="emphatic"></text> </if> <else><if present="useUrl"><link url="var:useUrl" title="message:GLOBAL_USE_DESC"><text key="GLOBAL_USE"></text></link></if></else> - </cell> + </column> </row> </list> </table> <if present="compareid"> <row> - <cell colspan="8" class="act"> + <column colspan="8" class="act"> <button type="ok"></button> - </cell> + </column> </row> </if> </form> diff --git a/themes/default/templates/pageelement/diff.tpl.src.xml b/themes/default/templates/pageelement/diff.tpl.src.xml @@ -2,42 +2,42 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row> - <cell></cell> - <cell> + <column></column> + <column> <text type="emphatic" text="GLOBAL_COMPARE"></text> <text raw="_"></text> <date date="var:date_left"></date> - </cell> - <cell></cell> - <cell> + </column> + <column></column> + <column> <text type="emphatic" text="GLOBAL_WITH"></text> <text raw="_"></text> <date date="var:date_right"></date> - </cell> + </column> </row> <row> - <cell colspan="4"></cell> + <column colspan="4"></column> </row> <list list="diff" extract="true"> <row class="diff"> <if present="left"> - <cell width="5%" class="line"> + <column width="5%" class="line"> <text value="arrayvar:left:line" type="tt"></text> - </cell> - <cell width="45%" class="arrayvar:left:type"> + </column> + <column width="45%" class="arrayvar:left:type"> <text value="arrayvar:left:text"></text> - </cell> + </column> </if> - <else><cell colspan="2" class="help" width="50%"><text raw="_"></text></cell></else> + <else><column colspan="2" class="help" width="50%"><text raw="_"></text></column></else> <if present="right"> - <cell width="5%" class="line"> + <column width="5%" class="line"> <text value="arrayvar:right:line" type="tt"></text> - </cell> - <cell width="45%" class="arrayvar:right:type"> + </column> + <column width="45%" class="arrayvar:right:type"> <text value="arrayvar:right:text"></text> - </cell> + </column> </if> - <else><cell colspan="2" class="help" width="50%"><text raw="_"></text></cell></else> + <else><column colspan="2" class="help" width="50%"><text raw="_"></text></column></else> </row> <set var="left"></set> <set var="right"></set> diff --git a/themes/default/templates/pageelement/edit.tpl.src.xml b/themes/default/templates/pageelement/edit.tpl.src.xml @@ -8,11 +8,11 @@ <text var="desc" class="help"></text> <if value="var:type" equals="date"> <if true="mode:edit"> - <fieldset title="message:calendar"> + <group title="message:calendar"> <part> <table width="85%" class="calendar"> <row> - <cell colspan="8" class="help"> + <column colspan="8" class="help"> <if true="mode:edit"> <link url="var:lastmonthurl"> <image file="left" align="middle"></image> @@ -40,25 +40,25 @@ <image file="right" align="middle"></image> </link> </if> - </cell> + </column> </row> <row> - <cell> + <column> <text key="week"></text> - </cell> + </column> <list list="weekdays" value="weekday"> - <cell> + <column> <text var="weekday"></text> - </cell> + </column> </list> </row> <list list="weeklist" key="weeknr" value="week"> <row> - <cell width="12%"> + <column width="12%"> <text var="weeknr"></text> - </cell> + </column> <list list="week" extract="true"> - <cell width="12%"> + <column width="12%"> <if empty="url"> <text raw="__"></text> <text var="nr" type="strong"></text> @@ -74,15 +74,15 @@ <if true="var:today"> <text raw="*"></text> </if> - </cell> + </column> </list> </row> </list> </table> </part> - </fieldset> + </group> </if> - <fieldset title="message:date"> + <group title="message:date"> <part> <label for="year"> <text key="date"></text> @@ -103,22 +103,22 @@ <text raw="_-_"></text> <selectbox name="second" list="all_seconds"></selectbox> </part> - </fieldset> + </group> </if> <if value="var:type" equals="text"> <row> - <cell colspan="2"> + <column colspan="2"> <input size="50" maxlength="255" class="text" name="text"></input> <focus field="text"></focus> - </cell> + </column> </row> </if> <if value="var:type" equals="longtext"> <if present="preview"> <part class="preview"> - <fieldset title="message:page_preview"> + <group title="message:page_preview"> <text var="preview" escape="false"></text> - </fieldset> + </group> </part> </if> <if value="var:editor" equals="html"> @@ -126,17 +126,17 @@ </if> <if value="var:editor" equals="wiki"> <if present="languagetext"> - <fieldset title="var:languagename"> + <group title="var:languagename"> <text var="languagetext"></text> - </fieldset> + </group> <newline></newline> <newline></newline> </if> <editor type="wiki" name="text"></editor> <if true="mode:edit"> - <fieldset title="message:help"> + <group title="message:help"> <table> - <cell> + <column> <text value="config:editor/text-markup/strong-begin"></text> <text key="text_markup_strong"></text> <text value="config:editor/text-markup/strong-end"></text> @@ -144,24 +144,24 @@ <text value="config:editor/text-markup/emphatic-begin"></text> <text key="text_markup_emphatic"></text> <text value="config:editor/text-markup/emphatic-end"></text> - </cell> - <cell> + </column> + <column> <text value="config:editor/text-markup/list-numbered"></text> <text key="text_markup_numbered_list"></text> <newline></newline> <text value="config:editor/text-markup/list-numbered"></text> <text raw="..."></text> <newline></newline> - </cell> - <cell> + </column> + <column> <text value="config:editor/text-markup/list-unnumbered"></text> <text key="text_markup_unnumbered_list"></text> <newline></newline> <text value="config:editor/text-markup/list-unnumbered"></text> <text raw="..."></text> <newline></newline> - </cell> - <cell> + </column> + <column> <text value="config:editor/text-markup/table-cell-sep"></text> <text key="text_markup_table"></text> <text value="config:editor/text-markup/table-cell-sep"></text> @@ -178,9 +178,9 @@ <text raw="..."></text> <text value="config:editor/text-markup/table-cell-sep"></text> <newline></newline> - </cell> + </column> </table> - </fieldset> + </group> </if> </if> <if value="var:editor" equals="text"> @@ -189,7 +189,7 @@ </if> </if> <if value="var:type" equals="link"> - <fieldset> + <group> <part> <label for="linkobjectid"> <text key="link_target"></text> @@ -205,46 +205,46 @@ <input name="linkurl"></input> </part> </if> - </fieldset> + </group> </if> <if value="var:type" equals="list"> - <fieldset> + <group> <part> <selectbox list="objects" name="linkobjectid"></selectbox> <focus field="linkobjectid"></focus> </part> - </fieldset> + </group> </if> <if value="var:type" equals="insert"> - <fieldset> + <group> <part> <selectbox list="objects" name="linkobjectid"></selectbox> <focus field="linkobjectid"></focus> </part> - </fieldset> + </group> </if> <if value="var:type" equals="number"> - <fieldset> + <group> <part> <hidden name="decimals" default="decimals"></hidden> <input size="15" maxlength="20" name="number"></input> <focus field="number"></focus> </part> - </fieldset> + </group> </if> <if value="var:type" equals="select"> - <fieldset> + <group> <part> <selectbox list="items" name="text"></selectbox> <focus field="text"></focus> </part> - </fieldset> + </group> </if> <if true="mode:edit"> <if value="var:type" equals="longtext"> <if value="var:editor" equals="wiki"> <if present="languages"> - <fieldset title="message:editor_show_language"> + <group title="message:editor_show_language"> <part> <list list="languages" key="languageid" value="languagename"> <radio name="otherlanguageid" value="var:languageid"></radio> @@ -254,20 +254,20 @@ <newline></newline> </list> </part> - </fieldset> + </group> </if> - <fieldset title="message:PAGE_PREVIEW"> + <group title="message:PAGE_PREVIEW"> <part> <checkbox name="preview"></checkbox> <label for="preview"> <text key="PAGE_PREVIEW"></text> </label> </part> - </fieldset> + </group> </if> </if> </if> - <fieldset title="message:options"> + <group title="message:options"> <if present="release"> <part> <checkbox name="release"></checkbox> @@ -284,7 +284,7 @@ </label> </part> </if> - </fieldset> + </group> </window> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/pageelement/export.tpl.src.xml b/themes/default/templates/pageelement/export.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="export" columnclasses="a"><row><cell><selectbox list="types" name="type"></selectbox></cell></row><row><cell><button type="ok"></button></cell></row></window></form><focus field="text"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="export" columnclasses="a"><row><column><selectbox list="types" name="type"></selectbox></column></row><row><column><button type="ok"></button></column></row></window></form><focus field="text"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/pageelement/import.tpl.src.xml b/themes/default/templates/pageelement/import.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="import" columnclasses="a"><row><cell><selectbox list="types" name="type"></selectbox></cell></row><row><cell><upload name="file"></upload></cell></row><row><cell><button type="ok"></button></cell></row></window></form><focus field="text"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="import" columnclasses="a"><row><column><selectbox list="types" name="type"></selectbox></column></row><row><column><upload name="file"></upload></column></row><row><column><button type="ok"></button></column></row></window></form><focus field="text"></focus></dummy></output>+ \ No newline at end of file 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"> + <column> + <text text="name"></text> + </column> + <column class="name"> + <text var="name"></text> + </column> + </row> + <row class="data"> + <column> + <text text="description"></text> + </column> + <column> + <text var="description"></text> + </column> + </row> + <row class="data"> + <column> + <text text="type"></text> + </column> + <column class="filename"> + <image elementtype="var:element_type"></image> + <text key="el_{element_type}"></text> + </column> + </row> + <row class="data"> + <column> + <text key="template"></text> + </column> + <column id="var:template_id" name="var:template_name" action="template"> + <image file="icon_template"></image> + <text var="template_name"></text> + </column> + </row> + <row class="data"> + <column> + <text key="element"></text> + </column> + <column id="var:element_id" name="var:element_name" action="element"> + <image type="var:element_type"></image> + <text var="element_name"></text> + </column> + </row> + <row class="data"> + <column> + <text text="lastchange"></text> + </column> + <column> + <image icon="el_date"></image> + <date date="var:lastchange_date"></date> + <text raw=", "></text> + <image icon="user"></image> + <user user="var:lastchange_user"></user> + </column> + </row> + </table> </output> \ No newline at end of file diff --git a/themes/default/templates/pageelement/link.tpl.src.xml b/themes/default/templates/pageelement/link.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="element"><row><cell colspan="2" class="help"><text var="desc"></text></cell></row><row><cell colspan="2"><selectbox list="objects" name="linkobjectid"></selectbox></cell></row><if present="release"><if present="publish"><row><cell colspan="2"><fieldset title="message:options"></fieldset></cell></row></if></if><if present="release"><row><cell colspan="2"><checkbox name="release"></checkbox><label for="release"><text raw="_"></text><text text="GLOBAL_RELEASE"></text></label></cell></row></if><if present="publish"><row><cell colspan="2"><checkbox name="publish"></checkbox><label for="publish"><text raw="_"></text><text text="PAGE_PUBLISH_AFTER_SAVE"></text></label></cell></row></if><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="linko"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="element"><row><column colspan="2" class="help"><text var="desc"></text></column></row><row><column colspan="2"><selectbox list="objects" name="linkobjectid"></selectbox></column></row><if present="release"><if present="publish"><row><column colspan="2"><group title="message:options"></group></column></row></if></if><if present="release"><row><column colspan="2"><checkbox name="release"></checkbox><label for="release"><text raw="_"></text><text text="GLOBAL_RELEASE"></text></label></column></row></if><if present="publish"><row><column colspan="2"><checkbox name="publish"></checkbox><label for="publish"><text raw="_"></text><text text="PAGE_PUBLISH_AFTER_SAVE"></text></label></column></row></if><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="linko"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/pageelement/preview.tpl.src.xml b/themes/default/templates/pageelement/preview.tpl.src.xml @@ -0,0 +1,10 @@ +<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"> + + <part class="preview"> + <group title="message:page_preview"> + <text var="preview" escape="false"></text> + </group> + </part> + +</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 @@ -4,40 +4,40 @@ <form> <window icon="folder" widths="40%,60%"> <row> - <cell> + <column> <text text="name"></text> - </cell> - <cell class="name"> + </column> + <column class="name"> <text var="name"></text> - </cell> + </column> </row> <row> - <cell> + <column> <text text="description"></text> - </cell> - <cell> + </column> + <column> <text var="description"></text> - </cell> + </column> </row> <row> - <cell> + <column> <text text="type"></text> - </cell> - <cell class="filename"> + </column> + <column class="filename"> <image elementtype="var:element_type"></image> <text key="el_{element_type}"></text> - </cell> + </column> </row> <row> - <cell colspan="2"> - <fieldset title="message:additional_info"></fieldset> - </cell> + <column colspan="2"> + <group title="message:additional_info"></group> + </column> </row> <row> - <cell> + <column> <text key="template"></text> - </cell> - <cell> + </column> + <column> <if present="template_url"> <link url="var:template_url" target="cms_main_main"> <image file="icon_template"></image> @@ -48,13 +48,13 @@ <image file="icon_template"></image> <text var="template_name"></text> </if> - </cell> + </column> </row> <row> - <cell> + <column> <text key="element"></text> - </cell> - <cell> + </column> + <column> <if present="element_url"> <link url="var:element_url" target="cms_main_main"> <image elementtype="var:element_type"></image> @@ -65,43 +65,31 @@ <image icon="element"></image> <text var="element_name"></text> </if> - </cell> + </column> </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> + <column colspan="2"> + <group title="message:prop_userinfo"></group> + </column> </row> <row> - <cell> + <column> <text text="lastchange"></text> - </cell> - <cell> + </column> + <column> <table> <row> - <cell> + <column> <image icon="el_date"></image> <date date="var:lastchange_date"></date> - </cell> - <cell> + </column> + <column> <image icon="user"></image> <user user="var:lastchange_user"></user> - </cell> + </column> </row> </table> - </cell> + </column> </row> </window> </form> diff --git a/themes/default/templates/pageelement/pub.tpl.src.xml b/themes/default/templates/pageelement/pub.tpl.src.xml @@ -0,0 +1,19 @@ +<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> + <group title="message:options"> + + <part class="line"> + <part class="label"> + </part> + <part class="input"> + <checkbox name="files"></checkbox> + <label for="files"> + <text text="global_files"></text> + </label> + </part> + </part> + + </group> + </form> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/pageelement/structure.tpl.src.xml b/themes/default/templates/pageelement/structure.tpl.src.xml @@ -0,0 +1,8 @@ +<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"> + <if present="text"> + <part class="structure"> + <editor type="dom" name="text"></editor> + </part> + </if> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/profile/confirmmail.tpl.src.xml b/themes/default/templates/profile/confirmmail.tpl.src.xml @@ -1,3 +1,3 @@ <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 title="GLOBAL_password" name="login" icon="user" widths="50%,50%"><row><cell class="logo" colspan="2"><logo name="changemail"></logo></cell></row><row><cell><text text="mail_code"></text></cell><cell><input type="text" name="code" size="30"></input></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="code"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window title="GLOBAL_password" name="login" icon="user" widths="50%,50%"><row><column class="logo" colspan="2"><logo name="changemail"></logo></column></row><row><column><text text="mail_code"></text></column><column><input type="text" name="code" size="30"></input></column></row><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="code"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/profile/edit.tpl.src.xml b/themes/default/templates/profile/edit.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="mail"></header> <form> - <fieldset title="message:name"> + <group title="message:name"> <part class="line"> <part class="label"> <label for="name" key="user_username"></label> @@ -11,8 +11,8 @@ <text var="name" class="name"></text> </part> </part> - </fieldset> - <fieldset title="message:MENU_PROFILE_MAIL"> + </group> + <group title="message:MENU_PROFILE_MAIL"> <part class="line"> <part class="label"> <label for="mail" key="user_mail"></label> @@ -25,8 +25,8 @@ </link> </part> </part> - </fieldset> - <fieldset title="message:GLOBAL_PROP"> + </group> + <group title="message:GLOBAL_PROP"> <part class="line"> <part class="label"> <label for="fullname" key="user_fullname"></label> @@ -60,6 +60,6 @@ default="config:interface/style/default"></selectbox> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/profile/mail.tpl.src.xml b/themes/default/templates/profile/mail.tpl.src.xml @@ -1,3 +1,3 @@ <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><header back="true"></header><form method="post"><window icon="user" name="user_profile"><row><cell class="logo" colspan="2"><logo name="changemail"></logo></cell></row><row><cell colspan="2"><fieldset title="message:user_mail"><label for="mail"><text text="user_new_mail"></text></label><input name="mail"></input></fieldset></cell></row><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></window></form><focus field="mail"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><header back="true"></header><form method="post"><window icon="user" name="user_profile"><row><column class="logo" colspan="2"><logo name="changemail"></logo></column></row><row><column colspan="2"><group title="message:user_mail"><label for="mail"><text text="user_new_mail"></text></label><input name="mail"></input></group></column></row><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="mail"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/profile/memberships.tpl.src.xml b/themes/default/templates/profile/memberships.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"> - <table><row class="headline"><cell><text key="name"></text></cell></row><if - empty="groups"><row class="data"><cell><text key="NOT_FOUND"></text></cell></row></if><list - list="groups" value="group"><row class="data"><cell><text var="group"></text></cell></row></list></table> + <table><row class="headline"><column><text key="name"></text></column></row><if + empty="groups"><row class="data"><column><text key="NOT_FOUND"></text></column></row></if><list + list="groups" value="group"><row class="data"><column><text var="group"></text></column></row></list></table> </output> \ No newline at end of file diff --git a/themes/default/templates/profile/pw.tpl.src.xml b/themes/default/templates/profile/pw.tpl.src.xml @@ -4,7 +4,7 @@ <logo name="changepassword"></logo> - <fieldset title="message:user_act_password"> + <group title="message:user_act_password"> <part class="line"> <part class="label"> <label for="act_password"> @@ -15,8 +15,8 @@ <password name="act_password" class="focus"></password> </part> </part> - </fieldset> - <fieldset title="message:user_new_password"> + </group> + <group title="message:user_new_password"> <part class="line"> <part class="label"> <label for="password1"> @@ -37,6 +37,6 @@ <password name="password2"></password> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/profile/settings.tpl.src.xml b/themes/default/templates/profile/settings.tpl.src.xml @@ -3,8 +3,8 @@ <form method="post"> <table> <row> - <cell> - <fieldset title="message:settings"> + <column> + <group title="message:settings"> <part> <checkbox name="always_edit"></checkbox> <label for="always_edit"><text key="setting_always_edit"></text> @@ -16,20 +16,20 @@ <text key="setting_ignore_ok_notices"></text> </label> </part> - </fieldset> - <fieldset title="message:timezone"> + </group> + <group title="message:timezone"> <selectbox name="timezone_offset" list="timezone_list" addempty="true"></selectbox> - </fieldset> - <fieldset title="message:language"> + </group> + <group title="message:language"> <selectbox name="language" list="language_list" addempty="true"></selectbox> - </fieldset> - </cell> + </group> + </column> </row> <row> - <cell colspan="2" class="act"> + <column colspan="2" class="act"> <button type="ok"></button> - </cell> + </column> </row> </table> </form> diff --git a/themes/default/templates/project/add.tpl.src.xml b/themes/default/templates/project/add.tpl.src.xml @@ -1,3 +1,3 @@ <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" widths="20px,20%,80%" width="70%"><row><cell colspan="2"><text text="message:name"></text></cell><cell><input name="name"></input></cell></row><row><cell colspan="3"><fieldset title="message:options"><part><radio name="type" value="empty"></radio><label for="type_empty"><text key="empty"></text></label></part><part><radio name="type" value="copy"></radio><label for="type_copy"><text key="copy"></text></label><selectbox name="projectid" list="projects"></selectbox></part></fieldset></cell></row><row><cell class="act" colspan="3"><button type="ok"></button></cell></row></window></form><focus field="name"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form method="post"><window icon="project" name="GLOBAL_PROJECTS" widths="20px,20%,80%" width="70%"><row><column colspan="2"><text text="message:name"></text></column><column><input name="name"></input></column></row><row><column colspan="3"><group title="message:options"><part><radio name="type" value="empty"></radio><label for="type_empty"><text key="empty"></text></label></part><part><radio name="type" value="copy"></radio><label for="type_copy"><text key="copy"></text></label><selectbox name="projectid" list="projects"></selectbox></part></group></column></row><row><column class="act" colspan="3"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/project/edit.tpl.src.xml b/themes/default/templates/project/edit.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="remove,export,maintenance"></header> <form> - <fieldset title="message:NAME"> + <group title="message:NAME"> <part class="line"> <part class="label"> <label for="name" key="PROJECT_NAME"></label> @@ -11,8 +11,8 @@ <input name="name" class="name"></input> </part> </part> - </fieldset> - <fieldset title="message:PUBLISH"> + </group> + <group title="message:PUBLISH"> <part class="line"> <part class="label"> <label for="target_dir" key="PROJECT_TARGET_DIR"></label> @@ -30,8 +30,8 @@ readonly="!config:publish/project/override_system_command"></input> </part> </part> - </fieldset> - <fieldset title="message:project_FTP"> + </group> + <group title="message:project_FTP"> <part class="line"> <part class="label"> <label for="ftp_url" key="PROJECT_FTP_URL"></label> @@ -43,8 +43,8 @@ <label for="ftp_passive" key="PROJECT_FTP_PASSIVE"></label> </part> </part> - </fieldset> - <fieldset title="message:options"> + </group> + <group title="message:options"> <part class="line"> <part class="label"></part> <part class="input"> @@ -59,6 +59,6 @@ <label for="cut_index" key="PROJECT_CUT_INDEX"></label> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/project/export.tpl.src.xml b/themes/default/templates/project/export.tpl.src.xml @@ -3,17 +3,17 @@ <header back="true"/> <form> <row> - <cell width="50%"> + <column width="50%"> <text key="GLOBAL_DATABASE"></text> - </cell> - <cell width="50%"> + </column> + <column width="50%"> <selectbox name="dbid" list="dbids" default="actdbid"></selectbox> - </cell> + </column> </row> <row> - <cell colspan="2" class="act"> + <column colspan="2" class="act"> <button></button> - </cell> + </column> </row> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/project/maintenance.tpl.src.xml b/themes/default/templates/project/maintenance.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true" /> <form> - <fieldset title="message:options"> + <group title="message:options"> <part> <text value=""></text> <radio name="type" value="check_limit"></radio> @@ -17,6 +17,6 @@ <text key="project_check_files"></text> </label> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/project/remove.tpl.src.xml b/themes/default/templates/project/remove.tpl.src.xml @@ -1,3 +1,3 @@ <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_NAME"></text></cell><cell><text var="name" class="name"></text></cell></row><row><cell colspan="2"><fieldset title="message:options"><part><checkbox name="delete"></checkbox><label for="delete"><text text="CONFIRM_DELETE"></text></label></part></fieldset></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 + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form method="post"><window><row><column><text text="GLOBAL_NAME"></text></column><column><text var="name" class="name"></text></column></row><row><column colspan="2"><group title="message:options"><part><checkbox name="delete"></checkbox><label for="delete"><text text="CONFIRM_DELETE"></text></label></part></group></column></row><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/projectlist/add.tpl.src.xml b/themes/default/templates/projectlist/add.tpl.src.xml @@ -10,7 +10,7 @@ <input name="name" class="focus"></input> </part> </part> - <fieldset title="message:options"> + <group title="message:options"> <part class="line"> <part class="label"> <radio name="type" value="empty" checked="true"></radio> @@ -26,6 +26,6 @@ </part> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/projectlist/show.tpl.src.xml b/themes/default/templates/projectlist/show.tpl.src.xml @@ -2,31 +2,25 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell> + <column> <text key="name"></text> - </cell> - <cell> - <text key="GLOBAL_SELECT"></text> - </cell> + </column> </row> <list list="el" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="project"> + <column id="var:id" name="var:name" action="project"> <image file="icon_project"></image> <text value="var:name" maxlength="30"></text> - </cell> - <cell url="var:use_url"> - <text key="GLOBAL_SELECT"></text> - </cell> + </column> </row> </list> <row class="data"> - <cell colspan="2"> + <column> <link type="view" subaction="add"> - <image icon="add"/> - <text text="new"/> + <image icon="add" /> + <text text="new" /> </link> - </cell> + </column> </row> </table> </output> \ No newline at end of file diff --git a/themes/default/templates/search/content.tpl.src.xml b/themes/default/templates/search/content.tpl.src.xml @@ -1,3 +1,3 @@ <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="search"><row><cell colspan="2"><fieldset title="message:global_user"></fieldset></cell></row><row><cell><radio name="type" value="lastchange_user"></radio><label for="type" value="lastchange_user"><text key="lastchange_user"></text></label></cell><cell><selectbox list="users" name="userid" default="var:act_userid"></selectbox></cell></row><row><cell colspan="2"><fieldset title="message:SEARCH_CONTENT"></fieldset></cell></row><row><cell><radio name="type" value="value" default="true"></radio><label for="type" value="value"><text key="value"></text></label></cell><cell><input name="text"></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 + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window icon="search"><row><column colspan="2"><group title="message:global_user"></group></column></row><row><column><radio name="type" value="lastchange_user"></radio><label for="type" value="lastchange_user"><text key="lastchange_user"></text></label></column><column><selectbox list="users" name="userid" default="var:act_userid"></selectbox></column></row><row><column colspan="2"><group title="message:SEARCH_CONTENT"></group></column></row><row><column><radio name="type" value="value" default="true"></radio><label for="type" value="value"><text key="value"></text></label></column><column><input name="text"></input></column></row><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/search/prop.tpl.src.xml b/themes/default/templates/search/prop.tpl.src.xml @@ -1,3 +1,3 @@ <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="search"><row><cell colspan="2"><fieldset title="message:global_user"></fieldset></cell></row><row><cell><radio name="type" value="create_user"></radio><label for="type" value="create_user"><text key="create_user"></text></label><newline></newline><radio name="type" value="lastchange_user"></radio><label for="type" value="lastchange_user"><text key="lastchange_user"></text></label></cell><cell><selectbox list="users" name="userid" default="var:act_userid"></selectbox></cell></row><row><cell colspan="2"><fieldset title="message:MENU_SEARCH_PROP"></fieldset></cell></row><row><cell><radio name="type" value="id"></radio><label for="type" value="id"><text key="id"></text></label><newline></newline><radio name="type" value="name" default="true"></radio><label for="type" value="name"><text key="name"></text></label><newline></newline><radio name="type" value="description"></radio><label for="type" value="description"><text key="description"></text></label><newline></newline><radio name="type" value="filename"></radio><label for="type" value="filename"><text key="filename"></text></label><newline></newline></cell><cell><input name="text"></input></cell></row><row class=""><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 + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window icon="search"><row><column colspan="2"><group title="message:global_user"></group></column></row><row><column><radio name="type" value="create_user"></radio><label for="type" value="create_user"><text key="create_user"></text></label><newline></newline><radio name="type" value="lastchange_user"></radio><label for="type" value="lastchange_user"><text key="lastchange_user"></text></label></column><column><selectbox list="users" name="userid" default="var:act_userid"></selectbox></column></row><row><column colspan="2"><group title="message:MENU_SEARCH_PROP"></group></column></row><row><column><radio name="type" value="id"></radio><label for="type" value="id"><text key="id"></text></label><newline></newline><radio name="type" value="name" default="true"></radio><label for="type" value="name"><text key="name"></text></label><newline></newline><radio name="type" value="description"></radio><label for="type" value="description"><text key="description"></text></label><newline></newline><radio name="type" value="filename"></radio><label for="type" value="filename"><text key="filename"></text></label><newline></newline></column><column><input name="text"></input></column></row><row class=""><column colspan="2" class="act"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/search/result.tpl.src.xml b/themes/default/templates/search/result.tpl.src.xml @@ -1,3 +1,3 @@ <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><window icon="search" widths="70%,30%"><row><cell class="help"><text key="GLOBAL_NAME"></text></cell><cell class="help"><text key="GLOBAL_LASTCHANGE"></text></cell></row><list list="result" extract="true"><row class="data"><cell><link url="var:url" target="cms_main"><image type="var:type"></image><text var="name" title="var:desc"></text></link></cell><cell><date date="var:lastchange_date"></date></cell></row></list></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window icon="search" widths="70%,30%"><row><column class="help"><text key="GLOBAL_NAME"></text></column><column class="help"><text key="GLOBAL_LASTCHANGE"></text></column></row><list list="result" extract="true"><row class="data"><column><link url="var:url" target="cms_main"><image type="var:type"></image><text var="name" title="var:desc"></text></link></column><column><date date="var:lastchange_date"></date></column></row></list></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/start/applications.tpl.src.xml b/themes/default/templates/start/applications.tpl.src.xml @@ -1,3 +1,3 @@ <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><window width="600" icon="project"><row><cell colspan="2"><link action="index" subaction="projectmenu"><text raw="OpenRat"></text></link></cell></row><list list="applications" extract="true"><row><cell><link url="var:url"><text var="name"></text></link></cell><cell><text var="description"></text></cell></row></list></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window width="600" icon="project"><row><column colspan="2"><link action="index" subaction="projectmenu"><text raw="OpenRat"></text></link></column></row><list list="applications" extract="true"><row><column><link url="var:url"><text var="name"></text></link></column><column><text var="description"></text></column></row></list></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/start/projectmenu.tpl.src.xml b/themes/default/templates/start/projectmenu.tpl.src.xml @@ -1,3 +1,3 @@ <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><window title="GLOBAL_PROJECTS"><row><cell class="logo" colspan="2"><logo name="projectmenu"></logo></cell></row><list list="projects" extract="true"><row><cell colspan="2"><fieldset title="var:name"><link type="post" id="var:id" title="message:TREE_CHOOSE_PROJECT"><set var="project" value="project"></set><image type="project"></image><text var="name" maxlength="30"></text></link><form action="index" subaction="project" id="var:id"><table widths="150px,150px"><row><cell><radiobox list="models" name="modelid" default="var:defaultmodelid"></radiobox></cell><cell><radiobox list="languages" name="languageid" default="var:defaultlanguageid"></radiobox></cell><cell><button type="ok" text="message:start"></button></cell></row></table></form></fieldset></cell></row></list></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window title="GLOBAL_PROJECTS"><row><column class="logo" colspan="2"><logo name="projectmenu"></logo></column></row><list list="projects" extract="true"><row><column colspan="2"><group title="var:name"><link type="post" id="var:id" title="message:TREE_CHOOSE_PROJECT"><set var="project" value="project"></set><image type="project"></image><text var="name" maxlength="30"></text></link><form action="index" subaction="project" id="var:id"><table widths="150px,150px"><row><column><radiobox list="models" name="modelid" default="var:defaultmodelid"></radiobox></column><column><radiobox list="languages" name="languageid" default="var:defaultlanguageid"></radiobox></column><column><button type="ok" text="message:start"></button></column></row></table></form></group></column></row></list></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/template/add.tpl.src.xml b/themes/default/templates/template/add.tpl.src.xml @@ -1,3 +1,3 @@ <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 name="GLOBAL_TEMPLATES" widths="10px,40px"><row><cell colspan="2"><text text="message:name"></text></cell><cell><input name="name"></input></cell></row><row><cell colspan="3"><fieldset title="message:options"></fieldset></cell></row><row><cell><radio name="type" value="empty"></radio></cell><cell><label for="type_empty"><text key="empty"></text></label></cell></row><row><cell><radio name="type" value="copy"></radio></cell><cell><label for="type_copy"><text key="copy"></text></label></cell><cell><selectbox name="templateid" list="templates"></selectbox></cell></row><row><cell><radio name="type" value="example"></radio></cell><cell><label for="type_example"><text key="example"></text></label></cell><cell><selectbox name="example" list="examples"></selectbox></cell></row><row><cell colspan="3" class="act"><button type="ok"></button></cell></row></window></form><focus field="name"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><form><window name="GLOBAL_TEMPLATES" widths="10px,40px"><row><column colspan="2"><text text="message:name"></text></column><column><input name="name"></input></column></row><row><column colspan="3"><group title="message:options"></group></column></row><row><column><radio name="type" value="empty"></radio></column><column><label for="type_empty"><text key="empty"></text></label></column></row><row><column><radio name="type" value="copy"></radio></column><column><label for="type_copy"><text key="copy"></text></label></column><column><selectbox name="templateid" list="templates"></selectbox></column></row><row><column><radio name="type" value="example"></radio></column><column><label for="type_example"><text key="example"></text></label></column><column><selectbox name="example" list="examples"></selectbox></column></row><row><column colspan="3" class="act"><button type="ok"></button></column></row></window></form><focus field="name"></focus></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/template/addel.tpl.src.xml b/themes/default/templates/template/addel.tpl.src.xml @@ -22,7 +22,7 @@ </part> </part> - <fieldset title="message:options"></fieldset> + <group title="message:options"></group> <part class="line"> <part class="label"> diff --git a/themes/default/templates/template/edit.tpl.src.xml b/themes/default/templates/template/edit.tpl.src.xml @@ -3,9 +3,9 @@ <header views="src,addel,srcelement,el,remove"></header> <window name="TEMPLATE_SHOW"> <row> - <cell> + <column> <text var="text" escape="false" type="code"></text> - </cell> + </column> </row> </window> </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 @@ -2,38 +2,38 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell> + <column> <text key="name"></text> - </cell> - <cell> + </column> + <column> <text key="type"></text> - </cell> + </column> </row> <list list="el" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="element"> + <column id="var:id" name="var:name" action="element"> <image elementtype="var:type"></image> <text var="name"></text> - </cell> - <cell> + </column> + <column> <text key="var:type" prefix="EL_"></text> - </cell> + </column> </row> </list> <if empty="el"> <row> - <cell colspan="2"> + <column colspan="2"> <text key="GLOBAL_NOT_FOUND"></text> - </cell> + </column> </row> </if> <row class="data"> - <cell colspan="2"> + <column colspan="2"> <link type="view" subaction="addel"> <image icon="add"/> <text key="menu_template_addel"></text> </link> - </cell> + </column> </row> </table> </output> \ No newline at end of file diff --git a/themes/default/templates/template/extension.tpl.src.xml b/themes/default/templates/template/extension.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true"></header> <form> - <fieldset> + <group> <part class="line"> <part class="label"> <text text="TEMPLATE_extension"></text> @@ -22,6 +22,6 @@ <input name="extensiontext" size="10"></input> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/template/listing.tpl.src.xml b/themes/default/templates/template/listing.tpl.src.xml @@ -5,15 +5,15 @@ <window name="GLOBAL_TEMPLATES"> <table> <row class="headline"> - <cell> + <column> <text key="name"></text> - </cell> + </column> </row> <list list="templates" extract="true"> <row class="data"> - <cell url="var:url"> + <column url="var:url"> <text var="name"></text> - </cell> + </column> </row> </list> </table> diff --git a/themes/default/templates/template/name.tpl.src.xml b/themes/default/templates/template/name.tpl.src.xml @@ -10,7 +10,7 @@ <input name="name"></input> </part> </part> - <fieldset></fieldset> + <group></group> <part class="line"> <part class="label"> diff --git a/themes/default/templates/template/pages.tpl.src.xml b/themes/default/templates/template/pages.tpl.src.xml @@ -3,18 +3,18 @@ <header back="true"></header> <table> <row class="headline"> - <cell> + <column> <text key="name"></text> - </cell> + </column> </row> <list list="pages" value="name" key="pageid"> <row class="data"> - <cell> + <column> <image icon="page"></image> <link action="main" subaction="page" id="var:pageid" target="cms_main"> <text var="name"></text> </link> - </cell> + </column> </row> </list> </table> diff --git a/themes/default/templates/template/preview.tpl.src.xml b/themes/default/templates/template/preview.tpl.src.xml @@ -0,0 +1,12 @@ +<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"> + <insert url="var:preview_url"></insert> + <link class="action" action="file" subaction="edit"> + <image file="icon/edit"></image> + <text key="menu_file_edit"></text> + </link> + <link class="action" action="file" subaction="editvalue"> + <image file="icon/editvalue"></image> + <text key="menu_file_editvalue"></text> + </link> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/template/remove.tpl.src.xml b/themes/default/templates/template/remove.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header back="true"></header> <form> - <fieldset> + <group> <part class="line"> <part class="label"> <text text="GLOBAL_NAME"></text> @@ -11,9 +11,9 @@ <text var="name" class="name"></text> </part> </part> - </fieldset> + </group> - <fieldset title="message:options"> + <group title="message:options"> <part class="line"> <part class="label"> @@ -25,6 +25,6 @@ </label> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/template/src.tpl.src.xml b/themes/default/templates/template/src.tpl.src.xml @@ -3,19 +3,19 @@ <header back="true"></header> <form> <row> - <cell> + <column> <inputarea rows="25" cols="80" name="src" class="editor"></inputarea> - </cell> + </column> </row> <row> - <cell class="act"> + <column class="act"> <button type="ok"></button> <if false="mode:edit"> <link class="action" action="template" subaction="srcelement"> <text key="menu_template_srcelement"></text> </link> </if> - </cell> + </column> </row> </form> <focus field="src"></focus> diff --git a/themes/default/templates/template/srcelement.tpl.src.xml b/themes/default/templates/template/srcelement.tpl.src.xml @@ -20,7 +20,7 @@ </if> <if present="writable_elements"> - <fieldset></fieldset> + <group></group> <part class="line"> <part class="label"> <radio name="type" value="addicon"></radio> diff --git a/themes/default/templates/templatelist/show.tpl.src.xml b/themes/default/templates/templatelist/show.tpl.src.xml @@ -2,25 +2,25 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell> + <column> <text key="name"></text> - </cell> + </column> </row> <list list="templates" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="template"> + <column id="var:id" name="var:name" action="template"> <text var="name"></text> - </cell> + </column> </row> </list> <row class="data"> - <cell colspan="1"> + <column colspan="1"> <link type="view" subaction="add"> <image icon="add"/> <text text="new"/> </link> - </cell> + </column> </row> </table> <if empty="templates"> diff --git a/themes/default/templates/tree/content.tpl.src.xml b/themes/default/templates/tree/content.tpl.src.xml @@ -1,3 +1,3 @@ <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"><window><table space="0" padding="0" class="tree"><list list="zeilen" extract="true"><row class="var:class"><list list="cols" value="i"><cell class="treecol"><image tree="var:i"></image></cell></list><if present="image"><cell class="treeimage"><if present="image_url"><link url="var:image_url" class="tree" target="_self" title="var:image_url_desc"><image tree="var:image"></image></link></if><else><image tree="var:image"></image></else></cell></if><cell colspan="var:colspan" class="treevalue"><link name="var:name"></link><if present="url"><link url="var:url" title="var:desc" class="tree" target="var:target"><image icon="var:icon"></image><text var="text" maxlength="20" cut="right"></text></link></if><else><image icon="var:icon"></image><text var="text" maxlength="20" cut="right" title="var:desc"></text></else></cell><set var="url"></set><set var="image"></set></row></list></table><insert function="loadTree"></insert></window></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><window><table space="0" padding="0" class="tree"><list list="zeilen" extract="true"><row class="var:class"><list list="cols" value="i"><column class="treecol"><image tree="var:i"></image></column></list><if present="image"><column class="treeimage"><if present="image_url"><link url="var:image_url" class="tree" target="_self" title="var:image_url_desc"><image tree="var:image"></image></link></if><else><image tree="var:image"></image></else></column></if><column colspan="var:colspan" class="treevalue"><link name="var:name"></link><if present="url"><link url="var:url" title="var:desc" class="tree" target="var:target"><image icon="var:icon"></image><text var="text" maxlength="20" cut="right"></text></link></if><else><image icon="var:icon"></image><text var="text" maxlength="20" cut="right" title="var:desc"></text></else></column><set var="url"></set><set var="image"></set></row></list></table><insert function="loadTree"></insert></window></output>+ \ No newline at end of file diff --git a/themes/default/templates/tree/settings.tpl.src.xml b/themes/default/templates/tree/settings.tpl.src.xml @@ -1,3 +1,3 @@ <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"><window><form><fieldset title="message:languages"><list list="languages" key="id" value="name"><part><radio name="languageid" value="var:id"></radio><label for="languageid" value="var:id"><text var="name"></text></label></part></list></fieldset><fieldset title="message:models"><list list="models" key="id" value="name"><part><radio name="modelid" value="var:id"></radio><label for="modelid" value="var:id"><text var="name"></text></label></part></list></fieldset></form><button type="ok"></button></window></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><window><form><group title="message:languages"><list list="languages" key="id" value="name"><part><radio name="languageid" value="var:id"></radio><label for="languageid" value="var:id"><text var="name"></text></label></part></list></group><group title="message:models"><list list="models" key="id" value="name"><part><radio name="modelid" value="var:id"></radio><label for="modelid" value="var:id"><text var="name"></text></label></part></list></group></form><button type="ok"></button></window></output>+ \ No newline at end of file diff --git a/themes/default/templates/tree/show.tpl.src.xml b/themes/default/templates/tree/show.tpl.src.xml @@ -5,12 +5,12 @@ <list list="zeilen" extract="true"> <row class="var:class"> <list list="cols" value="i"> - <cell class="treecol"> + <column class="treecol"> <image tree="var:i"></image> - </cell> + </column> </list> <if present="image"> - <cell class="treeimage"> + <column class="treeimage"> <if present="image_url"> <link url="var:image_url" class="tree" target="_self" title="var:image_url_desc"> @@ -18,9 +18,9 @@ </link> </if> <else><image tree="var:image"></image></else> - </cell> + </column> </if> - <cell colspan="var:colspan" class="treevalue"> + <column colspan="var:colspan" class="treevalue"> <link name="var:name"></link> <if present="url"> <link url="var:url" title="var:desc" class="tree" target="var:target"> @@ -30,7 +30,7 @@ </if> <else><image icon="var:icon"></image><text var="text" maxlength="20" cut="right" title="var:desc"></text></else> - </cell> + </column> <set var="url"></set> <set var="image"></set> </row> diff --git a/themes/default/templates/user/edit.tpl.src.xml b/themes/default/templates/user/edit.tpl.src.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <header views="remove"></header> <form> - <fieldset title="message:NAME"> + <group title="message:NAME"> <part class="line"> <part class="label"> <label for="name" key="user_username"></label> @@ -11,8 +11,8 @@ <input name="name" size="20" class="name,focus"></input> </part> </part> - </fieldset> - <fieldset title="message:ADDITIONAL_INFO"> + </group> + <group title="message:ADDITIONAL_INFO"> <part class="line"> <part class="label"> <label for="fullname" key="user_fullname"></label> @@ -47,8 +47,8 @@ <input name="tel"></input> </part> </part> - </fieldset> - <fieldset title="message:options"> + </group> + <group title="message:options"> <part class="line"> <part class="label"></part> <part class="input"> @@ -73,6 +73,6 @@ default="config:interface/style/default"></selectbox> </part> </part> - </fieldset> + </group> </form> </output> \ No newline at end of file diff --git a/themes/default/templates/user/listing.tpl.src.xml b/themes/default/templates/user/listing.tpl.src.xml @@ -1,3 +1,3 @@ <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><window icon="user" name="GLOBAL_USERS" width="70%"><table><row class="headline"><cell><image type="user"></image><text key="name"></text></cell><cell><text raw=""></text></cell><cell><text key="LOGIN"></text></cell></row><list list="el" extract="true"><row class="data"><cell url="var:url"><image type="user"></image><text var="name"></text></cell><cell url="var:url"><text value="var:fullname"></text><if true="var:isAdmin"><text raw="_("></text><text key="USER_ADMIN"></text><text raw=")"></text></if></cell><cell><link target="_top" action="index" subaction="switchuser" id="var:userid"><text key="LOGIN"></text></link></cell></row></list></table></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window icon="user" name="GLOBAL_USERS" width="70%"><table><row class="headline"><column><image type="user"></image><text key="name"></text></column><column><text raw=""></text></column><column><text key="LOGIN"></text></column></row><list list="el" extract="true"><row class="data"><column url="var:url"><image type="user"></image><text var="name"></text></column><column url="var:url"><text value="var:fullname"></text><if true="var:isAdmin"><text raw="_("></text><text key="USER_ADMIN"></text><text raw=")"></text></if></column><column><link target="_top" action="index" subaction="switchuser" id="var:userid"><text key="LOGIN"></text></link></column></row></list></table></window></dummy></output>+ \ No newline at end of file diff --git a/themes/default/templates/user/memberships.tpl.src.xml b/themes/default/templates/user/memberships.tpl.src.xml @@ -1,3 +1,3 @@ <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><window><table><row class="headline"><cell width="10%"></cell><cell><text key="name"></text></cell></row><list list="memberships" extract="true"><row class="data"><cell><checkbox name="var:var"></checkbox></cell><cell><label for="var:var"><image file="icon_group"></image><text var="name"></text></label></cell></row></list><row><cell colspan="2" class="act"><button type="ok"></button></cell></row></table></window></form></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><form><window><table><row class="headline"><column width="10%"></column><column><text key="name"></text></column></row><list list="memberships" extract="true"><row class="data"><column><checkbox name="var:var"></checkbox></column><column><label for="var:var"><image file="icon_group"></image><text var="name"></text></label></column></row></list><row><column colspan="2" class="act"><button type="ok"></button></column></row></table></window></form></output>+ \ No newline at end of file diff --git a/themes/default/templates/user/pw.tpl.src.xml b/themes/default/templates/user/pw.tpl.src.xml @@ -1,3 +1,3 @@ <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><part class="line"><part class="label"><label for="name" key="user_username"></label></part><part class="input"><text var="name" class="name"></text></part></part><fieldset title="message:USER_new_password"></fieldset><part class="line"><part class="label"><label for="password1" key="USER_new_password"></label></part><part class="input"><password name="password1"></password></part></part><part class="line"><part class="label"><label for="password2" key="USER_new_password_repeat"></label></part><part class="input"><password name="password2"></password></part></part><fieldset title="message:options"></fieldset><if present="mail"><part class="line"><part class="label"></part><part class="input"><checkbox name="email"></checkbox><label for="email" key="user_mail_new_password"></label></part></part><part class="line"><part class="label"></part><part class="input"><checkbox name="random"></checkbox><label for="random" key="user_random_password"></label></part></part><part class="line"><part class="label"></part><part class="input"><checkbox name="timeout"></checkbox><label for="timeout" key="user_password_timeout"></label></part></part></if><focus field="password1"></focus></form></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><form><part class="line"><part class="label"><label for="name" key="user_username"></label></part><part class="input"><text var="name" class="name"></text></part></part><group title="message:USER_new_password"></group><part class="line"><part class="label"><label for="password1" key="USER_new_password"></label></part><part class="input"><password name="password1"></password></part></part><part class="line"><part class="label"><label for="password2" key="USER_new_password_repeat"></label></part><part class="input"><password name="password2"></password></part></part><group title="message:options"></group><if present="mail"><part class="line"><part class="label"></part><part class="input"><checkbox name="email"></checkbox><label for="email" key="user_mail_new_password"></label></part></part><part class="line"><part class="label"></part><part class="input"><checkbox name="random"></checkbox><label for="random" key="user_random_password"></label></part></part><part class="line"><part class="label"></part><part class="input"><checkbox name="timeout"></checkbox><label for="timeout" key="user_password_timeout"></label></part></part></if><focus field="password1"></focus></form></output>+ \ No newline at end of file diff --git a/themes/default/templates/user/remove.tpl.src.xml b/themes/default/templates/user/remove.tpl.src.xml @@ -1,3 +1,3 @@ <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><fieldset title="message:NAME"><part class="line"><part class="label"><label key="user_username"></label></part><part class="input"><text var="name" class="name"></text></part></part><fieldset title="message:options"></fieldset><part class="line"><part class="label"></part><part class="input"><checkbox name="confirm"></checkbox><label for="confirm" key="delete"></label></part></part></fieldset></form></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><header back="true"></header><form><group title="message:NAME"><part class="line"><part class="label"><label key="user_username"></label></part><part class="input"><text var="name" class="name"></text></part></part><group title="message:options"></group><part class="line"><part class="label"></part><part class="input"><checkbox name="confirm"></checkbox><label for="confirm" key="delete"></label></part></part></group></form></output>+ \ No newline at end of file diff --git a/themes/default/templates/user/rights.tpl.src.xml b/themes/default/templates/user/rights.tpl.src.xml @@ -1,3 +1,3 @@ <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><window><list list="projects" extract="true"><row><cell colspan="2"><fieldset title="var:projectname"><if empty="acls"><part><text text="GLOBAL_NOT_FOUND"></text></part></if><if not="true" empty="acls"><table><row class="headline"><cell class="help"><text text="GLOBAL_USER"></text></cell><cell class="help"><text text="GLOBAL_NAME"></text></cell><cell class="help"><text text="GLOBAL_LANGUAGE"></text></cell><list list="show" value="t"><cell class="help"><text key="var:t" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text></cell></list></row><list list="rights" key="aclid" value="acl" extract="true"><row class="data"><cell><if present="username"><image type="user"></image><text var="username" maxlength="20"></text></if><if present="groupname"><image type="group"></image><text var="groupname" maxlength="20"></text></if><if not="true" present="username"><if not="true" present="groupname"><image type="group"></image><text key="global_all"></text></if></if><set var="username"></set><set var="groupname"></set></cell><cell><image type="var:objecttype"></image><link action="var:objecttype" subaction="" id="var:objectid"><text var="objectname" maxlength="20" title="message:select"></text></link></cell><cell><text var="languagename" maxlength="20"></text></cell><list list="show"><cell><set var="var:list_value" value="var:bits" key="var:list_value"></set><checkbox name="var:list_value" readonly="true"></checkbox></cell></list></row></list></table></if></fieldset></cell></row></list></window></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><dummy><window><list list="projects" extract="true"><row><column colspan="2"><group title="var:projectname"><if empty="acls"><part><text text="GLOBAL_NOT_FOUND"></text></part></if><if not="true" empty="acls"><table><row class="headline"><column class="help"><text text="GLOBAL_USER"></text></column><column class="help"><text text="GLOBAL_NAME"></text></column><column class="help"><text text="GLOBAL_LANGUAGE"></text></column><list list="show" value="t"><column class="help"><text key="var:t" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text></column></list></row><list list="rights" key="aclid" value="acl" extract="true"><row class="data"><column><if present="username"><image type="user"></image><text var="username" maxlength="20"></text></if><if present="groupname"><image type="group"></image><text var="groupname" maxlength="20"></text></if><if not="true" present="username"><if not="true" present="groupname"><image type="group"></image><text key="global_all"></text></if></if><set var="username"></set><set var="groupname"></set></column><column><image type="var:objecttype"></image><link action="var:objecttype" subaction="" id="var:objectid"><text var="objectname" maxlength="20" title="message:select"></text></link></column><column><text var="languagename" maxlength="20"></text></column><list list="show"><column><set var="var:list_value" value="var:bits" key="var:list_value"></set><checkbox name="var:list_value" readonly="true"></checkbox></column></list></row></list></table></if></group></column></row></list></window></dummy></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 @@ -2,45 +2,45 @@ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> <table> <row class="headline"> - <cell> + <column> <image type="user"></image> <text key="name"></text> - </cell> - <cell> + </column> + <column> <text raw=""></text> - </cell> - <cell> + </column> + <column> <text key="LOGIN"></text> - </cell> + </column> </row> <list list="el" extract="true"> <row class="data"> - <cell id="var:id" name="var:name" action="user"> + <column id="var:id" name="var:name" action="user"> <image type="user"></image> <text var="name"></text> - </cell> - <cell id="var:id" name="var:name" action="user"> + </column> + <column id="var:id" name="var:name" action="user"> <text value="var:fullname"></text> <if true="var:isAdmin"> <text raw="_("></text> <text key="USER_ADMIN"></text> <text raw=")"></text> </if> - </cell> - <cell> + </column> + <column> <link target="_top" action="index" subaction="switchuser" id="var:userid"> <text key="LOGIN"></text> </link> - </cell> + </column> </row> </list> <row class="data"> - <cell colspan="3"> + <column colspan="3"> <link type="view" subaction="add"> <image icon="add"/> <text text="new"/> </link> - </cell> + </column> </row> </table> </output> \ No newline at end of file