commit 9322ac0a5c45a496ababc48ade3a2192ec34a846
parent c4190677987bf1bc424de1b23d3b8fd8f449e8c3
Author: Jan Dankert <devnull@localhost>
Date: Sat, 27 Oct 2012 02:04:12 +0200
In der Seitenvorschau, falls Editierknöpfe angezeigt werden, diese auch in verlinkten Seiten anzeigen.
Diffstat:
2 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/action/PageAction.class.php b/action/PageAction.class.php
@@ -511,7 +511,7 @@ class PageAction extends ObjectAction
}
}
- $this->setTemplateVar('preview_url',Html::url('page','view',$this->page->objectid,array('target'=>'none') ) );
+ $this->setTemplateVar('preview_url',Html::url('page','show',$this->page->objectid,array('withIcons'=>'1') ) );
$this->setTemplateVar('el',$list);
}
@@ -620,7 +620,7 @@ class PageAction extends ObjectAction
*/
function previewView()
{
- $this->setTemplateVar('preview_url',Html::url('page','show',$this->page->objectid,array('target'=>'none') ) );
+ $this->setTemplateVar('preview_url',Html::url('page','show',$this->page->objectid ) );
}
/**
@@ -629,6 +629,9 @@ class PageAction extends ObjectAction
function showView()
{
// Seite definieren
+ if ( $this->hasRequestVar('withIcons') )
+ $this->page->icons = true;
+
$this->page->load();
$this->page->generate();
$this->page->write();
@@ -652,40 +655,6 @@ class PageAction extends ObjectAction
/**
- * Die Seite im Bearbeitungsmodus anzeigen
- *
- * Bei editierbaren Feldern wird ein Editor-Ikon vorangestellt.
- */
- public function viewView()
- {
- // Editier-Icons anzeigen
- $this->page->icons = true;
-
- $this->page->load();
- $this->page->generate();
- $this->page->write();
-
- header('Content-Type: '.$this->page->mimeType().'; charset='.$this->getCharset() );
-
- // HTTP-Header mit Sprachinformation setzen.
- $language = Session::getProjectLanguage();
- header('Content-Language: '.$language->isoCode);
-
-
- // Wenn
- if ( ( config('publish','enable_php_in_page_content')=='auto' && $this->page->template->extension == 'php') ||
- config('publish','enable_php_in_page_content')===true )
- require( $this->page->tmpfile() );
- else
- readfile( $this->page->tmpfile() );
-
- // Inhalt ist ausgegeben... Skript beenden.
- exit;
- }
-
-
-
- /**
* Den Quellcode der Seite anzeigen
*
* Alle HTML-Sonderzeichen werden maskiert
diff --git a/model/Page.class.php b/model/Page.class.php
@@ -175,6 +175,9 @@ class Page extends Object
return '';
$param = array('oid'=>'__OID__'.$objectid.'__');
+
+ if ( $this->icons )
+ $param['withIcons'] = '1';
$object = new Object( $objectid );
$object->objectLoad();