resolved conflicts
This commit is contained in:
Logsol
commit
4bb0f353a2
4 changed files with 37 additions and 64 deletions
|
|
@ -15,7 +15,8 @@ class PageController extends Katharsis_Controller_Abstract
|
|||
{
|
||||
$preview = true;
|
||||
}
|
||||
$url = substr($method, 0, -6);
|
||||
|
||||
$url = substr($method, 0, -6); // remove Action from urlAction
|
||||
|
||||
$pageId = $this->_page->getIdByUrl($url);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +1,6 @@
|
|||
<div id="admin">
|
||||
<h3>Page bearbeiten</h3>
|
||||
|
||||
<!-- TinyMCE -->
|
||||
<script type="text/javascript" src="<?php echo $this->base ?>/scripts/tiny_mce/tiny_mce.js"></script>
|
||||
<script type="text/javascript">
|
||||
tinyMCE.init({
|
||||
// General options
|
||||
language : "de",
|
||||
mode : "textareas",
|
||||
theme : "advanced",
|
||||
plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
|
||||
|
||||
// Theme options
|
||||
theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
|
||||
theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,preview,|,forecolor,backcolor",
|
||||
theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
|
||||
theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",
|
||||
theme_advanced_toolbar_location : "top",
|
||||
theme_advanced_toolbar_align : "left",
|
||||
theme_advanced_statusbar_location : "bottom",
|
||||
theme_advanced_resizing : true,
|
||||
|
||||
// Example content CSS (should be your site CSS)
|
||||
content_css : "<?php echo $this->base ?>/style/tiny.css",
|
||||
|
||||
// Drop lists for link/image/media/template dialogs
|
||||
template_external_list_url : "lists/template_list.js",
|
||||
external_link_list_url : "lists/link_list.js",
|
||||
external_image_list_url : "lists/image_list.js",
|
||||
media_external_list_url : "lists/media_list.js",
|
||||
|
||||
// Style formats
|
||||
style_formats : [
|
||||
{title : 'Bold text', inline : 'b'},
|
||||
{title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},
|
||||
{title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},
|
||||
{title : 'Example 1', inline : 'span', classes : 'example1'},
|
||||
{title : 'Example 2', inline : 'span', classes : 'example2'},
|
||||
{title : 'Table styles'},
|
||||
{title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}
|
||||
],
|
||||
|
||||
// Replace values for the template plugin
|
||||
template_replace_values : {
|
||||
username : "Some User",
|
||||
staffid : "991234"
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<!-- /TinyMCE -->
|
||||
|
||||
<form action="<?php echo $this->base ?>/adminPage/save"method="post">
|
||||
<input type="hidden" name="id" value="<?php echo $this->page['id'] ?>" />
|
||||
<dl>
|
||||
|
|
@ -77,7 +28,7 @@
|
|||
</dd>
|
||||
</dl>
|
||||
<dl>
|
||||
<dt>Header Bild</dt>
|
||||
<dt>Headerbild</dt>
|
||||
<dd>
|
||||
<input class="textfield" type="text" name="header_image" value="<?php echo $this->page['header_image'] ?>"/>
|
||||
<a href="javascript: void(0);" onclick="window.open('/adminPage/image/type/header', 'fenster1', 'width=600,height=400,status=yes,scrollbars=yes,resizable=yes');">Auswählen</a>
|
||||
|
|
|
|||
|
|
@ -75,6 +75,10 @@
|
|||
|
||||
</article>
|
||||
|
||||
<footer>
|
||||
<p>Naturheilpraxis SEINHEIT. Kinga Pannek, Bahnhofstraße 105, 8620 Wetzikon, Schweiz</p>
|
||||
</footer>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,28 +1,45 @@
|
|||
#adminNavigation {
|
||||
font-family: verdana;
|
||||
background-color: #90CB93;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
width: 689px;
|
||||
background: #90CB93;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
padding: 2px;
|
||||
font-size: 0.8em;
|
||||
width: 725px;
|
||||
* width: 729px;
|
||||
padding: 0 70px;
|
||||
width: 100%;
|
||||
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
|
||||
-moz-box-sizing: border-box; /* Firefox, other Gecko */
|
||||
box-sizing: border-box; /* Opera/IE 8+ */
|
||||
box-shadow: 0 0 10px rgba(0,0,0,0.5);
|
||||
border-top: 1px solid #85c188;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
#adminNavigation li {
|
||||
float: left;
|
||||
padding: 0 5px;
|
||||
display: inline-block;
|
||||
margin: -1px 0 0 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#adminNavigation li:first-child {
|
||||
padding-right: 1em;
|
||||
}
|
||||
|
||||
#adminNavigation li:last-child {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#adminNavigation a {
|
||||
color: white;
|
||||
background-color: #416843;
|
||||
padding: 3px 5px;
|
||||
background: #416843;
|
||||
padding: 1em 2em;
|
||||
text-decoration: none;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
#adminNavigation a:hover {
|
||||
background: #216849;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue