Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

build 970: add restore last version feature

  • Loading branch information...
commit a2396cf3393ed749beb65718ba21d1bd436a051b 1 parent 32a7ba6
Fabian Vogelsteller authored
Showing with 204 additions and 117 deletions.
  1. +2 −1  CHANGELOG
  2. +1 −1  VERSION
  3. +26 −8 index.php
  4. +3 −3 library/classes/Feindura.class.php
  5. +21 −12 library/classes/GeneralFunctions.class.php
  6. +15 −12 library/controllers/editor.controller.php
  7. BIN  library/images/buttons/subMenu_restorePage.png
  8. BIN  library/images/icons/breadCrumb_page.png
  9. BIN  library/images/icons/revertStateIcon_small.png
  10. +2 −2 library/includes/backend.include.php
  11. +5 −1 library/includes/editPlugins.leftSideBar.include.php
  12. +1 −1  library/includes/editor.include.php
  13. +15 −29 library/javascripts/content.js
  14. +1 −1  library/javascripts/loading.js
  15. +5 −3 library/languages/de.backend.php
  16. +4 −2 library/languages/en.backend.php
  17. +5 −2 library/languages/fr.backend.php
  18. +5 −2 library/languages/it.backend.php
  19. +5 −2 library/languages/ru.backend.php
  20. +1 −1  library/leftSidebar.loader.php
  21. +7 −0 library/styles/less/general.less
  22. +5 −0 library/styles/less/icons.less
  23. +10 −7 library/styles/less/layout.less
  24. +21 −6 library/styles/less/page_editor.less
  25. +36 −10 library/styles/styles.css
  26. +1 −1  library/thirdparty/ckeditor/plugins/feinduraSnippets/plugin.js
  27. +6 −9 library/views/editor.php
  28. +1 −1  update.php
3  CHANGELOG
View
@@ -1,7 +1,7 @@
feindura - Flat File Content Management System
Version
2.0 beta
-Build 969
+Build 970
==================================================
Copyright (C) Fabian Vogelsteller [frozeman.de]
published under the GNU General Public License version 3
@@ -24,6 +24,7 @@ ChangeLog:
2.0 beta
+ build 970: add restore last version feature
build 969: made more use of the pagesMetaData array, should boost the perfomance, still issues with the previous state button
build 968: changed versin name to beta, moved userlist to the header sidebar
build 967: small header fixes
2  VERSION
View
@@ -1,3 +1,3 @@
feindura - Flat File CMS (Version,Build)
2.0 beta
-969
+970
34 index.php
View
@@ -29,6 +29,7 @@
*/
require_once(dirname(__FILE__)."/library/controller.loader.php");
+
// VARs
// -----------------------------------------------------------------------------------
// store the current location, this will be used when the user comes back from the frontend
@@ -220,7 +221,7 @@
},
//complete
onComplete: function () {
- window.location = 'index.php?logout';
+ window.location.href = 'index.php?logout';
}
})
<?php } ?>
@@ -244,8 +245,8 @@
<div class="menuBlock">
<div class="languageSelection">
- <a href="<?php echo GeneralFunctions::addParameterToUrl('backendLanguage','de'); ?>" tabindex="20" class="de toolTipBottom" title="Deutsch::"></a>
- <a href="<?php echo GeneralFunctions::addParameterToUrl('backendLanguage','en'); ?>" tabindex="21" class="en toolTipBottom" title="English::"></a>
+ <a href="<?php echo GeneralFunctions::addParameterToUrl('backendLanguage','en'); ?>" tabindex="20" class="en toolTipBottom" title="English::"></a>
+ <a href="<?php echo GeneralFunctions::addParameterToUrl('backendLanguage','de'); ?>" tabindex="21" class="de toolTipBottom" title="Deutsch::"></a>
<a href="<?php echo GeneralFunctions::addParameterToUrl('backendLanguage','fr'); ?>" tabindex="22" class="fr toolTipBottom" title="français::"></a>
<a href="<?php echo GeneralFunctions::addParameterToUrl('backendLanguage','it'); ?>" tabindex="23" class="it toolTipBottom" title="italiano::"></a>
<a href="<?php echo GeneralFunctions::addParameterToUrl('backendLanguage','ru'); ?>" tabindex="24" class="ru toolTipBottom" title="русский::"></a>
@@ -364,6 +365,9 @@
// -> CHECK for deletePageThumbnail
$showPageThumbnailDelete = (empty($_GET['site']) && !empty($pageContent['thumbnail'])) ? true : false;
+ // -> CHECK for restore page (if and old state exists)
+ $showRestorePage = ($previousStatePageContent) ? true : false;
+
// -> CHECK if show SUBMENU
$showSubMenu = (($showPageThumbnailUpload || $showCreatePage || $showPageThumbnailUpload || GeneralFunctions::hasPermission('fileManager') || $showDeletePage)) ? true : false;
@@ -471,6 +475,7 @@
<?php if($showFrontendEditing ||
$showDeletePage ||
+ $showRestorePage ||
$showPageThumbnailUpload ||
$showPageThumbnailDelete ||
($websiteConfig['multiLanguageWebsite']['active'] && $isInPageEditor) ||
@@ -518,9 +523,22 @@
<li><a <?php echo 'href="?site=deletePage&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" onclick="openWindowBox(\'library/views/windowBox/deletePage.php?category='.$_GET['category'].'&amp;page='.$_GET['page'].'\',\''.$langFile['BUTTON_DELETEPAGE'].'\');return false;" title="'.$langFile['BUTTON_DELETEPAGE'].'::'.$langFile['BUTTON_TOOLTIP_DELETEPAGE'].'"'; ?> tabindex="32" class="deletePage toolTipBottom"></a></li>
- <?php $showSpacer = true;
+ <?php $showSpacer = false;
}
+ // RESTORE PAGE
+ if($showRestorePage) {
+ if($showSpacer) { ?>
+
+ <li class="spacer"></li>
+
+ <?php } ?>
+
+ <li><a <?php echo 'href="index.php?category='.$pageContent['category'].'&amp;page='.$pageContent['id'].'&amp;status=revertToPreviousState&amp;reload='.rand(0,999).'" title="::'.sprintf($langFile['EDITOR_BUTTON_RESTORELASTSTATE'],GeneralFunctions::dateDayBeforeAfter($previousStatePageContent['lastSaveDate']).' '.formatTime($previousStatePageContent['lastSaveDate'])).'"'; ?> tabindex="33" class="restorePage toolTipBottom"></a></li>
+
+ <?php
+ } if($showDeletePage || $showRestorePage) $showSpacer = true;
+
// PAGETHUMBNAILUPLOAD
if($showPageThumbnailUpload) {
if($showSpacer) { ?>
@@ -529,13 +547,13 @@
<?php } ?>
- <li><a <?php echo 'href="?site=uploadPageThumbnail&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" onclick="openWindowBox(\'library/views/windowBox/uploadPageThumbnail.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'\',\''.$langFile['BUTTON_THUMBNAIL_UPLOAD'].'\');return false;" title="'.$langFile['BUTTON_THUMBNAIL_UPLOAD'].'::'.$langFile['BUTTON_TOOLTIP_THUMBNAIL_UPLOAD'].'"'; ?> tabindex="33" class="uploadPageThumbnail toolTipBottom"></a></li>
+ <li><a <?php echo 'href="?site=uploadPageThumbnail&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" onclick="openWindowBox(\'library/views/windowBox/uploadPageThumbnail.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'\',\''.$langFile['BUTTON_THUMBNAIL_UPLOAD'].'\');return false;" title="'.$langFile['BUTTON_THUMBNAIL_UPLOAD'].'::'.$langFile['BUTTON_TOOLTIP_THUMBNAIL_UPLOAD'].'"'; ?> tabindex="34" class="uploadPageThumbnail toolTipBottom"></a></li>
<?php
// PAGETHUMBNAILDELETE
if($showPageThumbnailDelete) { ?>
- <li><a <?php echo 'href="?site=deletePageThumbnail&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" onclick="openWindowBox(\'library/views/windowBox/deletePageThumbnail.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'\',\''.$langFile['BUTTON_THUMBNAIL_DELETE'].'\');return false;" title="'.$langFile['BUTTON_THUMBNAIL_DELETE'].'::'.$langFile['BUTTON_TOOLTIP_THUMBNAIL_DELETE'].'"'; ?> tabindex="34" class="deletePageThumbnail toolTipBottom"></a></li>
+ <li><a <?php echo 'href="?site=deletePageThumbnail&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" onclick="openWindowBox(\'library/views/windowBox/deletePageThumbnail.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'\',\''.$langFile['BUTTON_THUMBNAIL_DELETE'].'\');return false;" title="'.$langFile['BUTTON_THUMBNAIL_DELETE'].'::'.$langFile['BUTTON_TOOLTIP_THUMBNAIL_DELETE'].'"'; ?> tabindex="35" class="deletePageThumbnail toolTipBottom"></a></li>
<?php }
$showSpacer = true;
@@ -553,7 +571,7 @@
<?php }
if($missingLanguages) { ?>
- <li><a <?php echo 'href="?site=addPageLanguage&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" onclick="openWindowBox(\'library/views/windowBox/addPageLanguage.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'\',\''.$langFile['BUTTON_WEBSITELANGUAGE_ADD'].'\');return false;" title="'.$langFile['BUTTON_WEBSITELANGUAGE_ADD'].'::'.$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_ADD'].'"'; ?> tabindex="35" class="addPageLanguage toolTipBottom"></a></li>
+ <li><a <?php echo 'href="?site=addPageLanguage&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" onclick="openWindowBox(\'library/views/windowBox/addPageLanguage.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'\',\''.$langFile['BUTTON_WEBSITELANGUAGE_ADD'].'\');return false;" title="'.$langFile['BUTTON_WEBSITELANGUAGE_ADD'].'::'.$langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_ADD'].'"'; ?> tabindex="36" class="addPageLanguage toolTipBottom"></a></li>
<?php
}
@@ -561,7 +579,7 @@
if(isset($_GET['page']) && !isset($pageContent['localized'][0]) && isset($pageContent['localized'][$_SESSION['feinduraSession']['websiteLanguage']])) { ?>
<!-- <li class="spacer"></li> -->
- <li><a <?php echo 'href="?site=deletePageLanguage&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'&amp;language='.$_SESSION['feinduraSession']['websiteLanguage'].'" onclick="openWindowBox(\'library/views/windowBox/deletePageLanguage.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'&amp;language='.$_SESSION['feinduraSession']['websiteLanguage'].'\',\''.$langFile['BUTTON_WEBSITELANGUAGE_DELETE'].'\');return false;" title="'.$langFile['BUTTON_WEBSITELANGUAGE_DELETE'].'::'.sprintf($langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_DELETE'],'[strong]'.$languageNames[$_SESSION['feinduraSession']['websiteLanguage']].'[/strong]').'"'; ?> tabindex="36" class="removePageLanguage toolTipBottom"></a></li>
+ <li><a <?php echo 'href="?site=deletePageLanguage&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'&amp;language='.$_SESSION['feinduraSession']['websiteLanguage'].'" onclick="openWindowBox(\'library/views/windowBox/deletePageLanguage.php?site='.$_GET['site'].'&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'&amp;language='.$_SESSION['feinduraSession']['websiteLanguage'].'\',\''.$langFile['BUTTON_WEBSITELANGUAGE_DELETE'].'\');return false;" title="'.$langFile['BUTTON_WEBSITELANGUAGE_DELETE'].'::'.sprintf($langFile['BUTTON_TOOLTIP_WEBSITELANGUAGE_DELETE'],'[strong]'.$languageNames[$_SESSION['feinduraSession']['websiteLanguage']].'[/strong]').'"'; ?> tabindex="37" class="removePageLanguage toolTipBottom"></a></li>
<?php }
$showSpacer = true;
6 library/classes/Feindura.class.php
View
@@ -1632,7 +1632,7 @@ public function createMenu($idType = 'category', $ids = false, $menuTag = false,
// -> STOREs the LINKs in an Array
$links = array();
- if($pages !== false) {
+ if(!empty($pages)) {
// create a link out of every page in the array
foreach($pages as $page) {
// creates the link
@@ -1688,7 +1688,7 @@ public function createMenu($idType = 'category', $ids = false, $menuTag = false,
}
}
} else
- return array(false);
+ return array();
return $this->generateMenu($links,$menuTag,$breakAfter);
}
@@ -3061,7 +3061,7 @@ public function listPages($idType = 'category', $ids = false, $shortenText = fal
if($sortByCategories === true)
$pages = GeneralFunctions::sortPages($pages);
- if($pages !== false) {
+ if(!empty($pages)) {
// -> list a category(ies)
// ------------------------------
33 library/classes/GeneralFunctions.class.php
View
@@ -990,6 +990,7 @@ public static function readPage($page,$category = false,$readPrevious = false) {
// ->> ELSE load the page and store it in the storePages PROPERTY
} else {
+ // add the previous name when reading the previous state
$previous = ($readPrevious) ? '.previous' : '';
// adds .php to the end if its missing
@@ -1008,7 +1009,7 @@ public static function readPage($page,$category = false,$readPrevious = false) {
//echo 'CATEGORY: '.$category.'<br>';
// ->> INCLUDE
- if($fp = @fopen(dirname(__FILE__).'/../../pages/'.$category.$page,'r')) {
+ if($fp = @fopen(dirname(__FILE__).'/../../pages/'.$category.$page,'rb')) {
flock($fp,LOCK_SH);
$pageContent = @include(dirname(__FILE__).'/../../pages/'.$category.$page);
flock($fp,LOCK_UN);
@@ -1017,6 +1018,7 @@ public static function readPage($page,$category = false,$readPrevious = false) {
// return content array
if(is_array($pageContent)) {
+
// UNESCPAE the SINGLE QUOTES '
if(is_array($pageContent['localized'])) {
foreach ($pageContent['localized'] as $key => $value)
@@ -1055,6 +1057,7 @@ public static function readPage($page,$category = false,$readPrevious = false) {
* - <var>"\n?>"</var> the php end tag
*
* @param array $pageContent the $pageContent array of the page to save
+ * @param bool $readPrevious (optional) if TRUE it will save the given $pageContent as a previous state of the page
*
* @uses $adminConfig for the save path of the flatfiles
* @uses addStoredPage() to store the saved file agiain, and overwrite th old stored page
@@ -1074,7 +1077,7 @@ public static function readPage($page,$category = false,$readPrevious = false) {
* - 1.0 initial release
*
*/
- public static function savePage($pageContent) {
+ public static function savePage($pageContent,$savePrevious = false) {
// check if array is pageContent array
if(!self::isPageContentArray($pageContent))
@@ -1093,8 +1096,11 @@ public static function savePage($pageContent) {
// get path
$filePath = ($categoryId === false || $categoryId == 0)
- ? dirname(__FILE__).'/../../pages/'.$pageId.'.php'
- : dirname(__FILE__).'/../../pages/'.$categoryId.'/'.$pageId.'.php';
+ ? dirname(__FILE__).'/../../pages/'.$pageId
+ : dirname(__FILE__).'/../../pages/'.$categoryId.'/'.$pageId;
+
+ // previous or current state
+ $filePath .= ($savePrevious) ? '.previous.php' : '.php';
// escape \ and '
$pageContent = XssFilter::escapeBasics($pageContent);
@@ -1174,14 +1180,17 @@ public static function savePage($pageContent) {
@chmod($filePath,self::$adminConfig['permissions']);
- // writes the new saved page to the $storedPages property
- self::removeStoredPage($pageContent['id']); // remove the old one
- unset($pageContent);
- $pageContent = include($filePath);
- self::addStoredPage($pageContent);
+ // only when current, reload the storedPages array and pagesMetaData
+ if(!$savePrevious) {
+ // writes the new saved page to the $storedPages property
+ self::removeStoredPage($pageContent['id']); // remove the old one
+ unset($pageContent);
+ $pageContent = include($filePath);
+ self::addStoredPage($pageContent);
- // reload the $pagesMetaData array
- self::savePagesMetaData();
+ // reload the $pagesMetaData array
+ self::savePagesMetaData();
+ }
return true;
} else
@@ -2269,7 +2278,7 @@ static function createBreadCrumbsArray($page,$category) {
*/
public static function cleanPluginPlaceholders($content) {
// remove the src attribute
- $content = preg_replace('#src\=\"((?:(?!").)*library\/thirdparty\/ckeditor\/plugins\/feinduraSnippets\/snippetFill\.gif?)\"#i', 'src="#"', $content);
+ $content = preg_replace('#src\=\"((?:(?!").)*library\/thirdparty\/ckeditor\/plugins\/feinduraSnippets\/snippetFill\.gif?)\"#i', 'src="noImage.png"', $content);
// add the draggable=true back again
if(strpos($content, 'class="feinduraPlugin" draggable="true"') === false)
27 library/controllers/editor.controller.php
View
@@ -30,20 +30,21 @@
// REVERT to a PREVIOUS STATE
// -----------------------------------------------------------------------------
if(isBlocked() === false && $_GET['status'] == 'revertToPreviousState') {
- $categoryFolder = ($category == 0) ? '' : $category.'/';
- GeneralFunctions::dump(dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.previous.php');
+ // vars
+ $categoryFolder = ($category == 0) ? '' : $category.'/';
if(file_exists(dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.previous.php')) {
- // rename the previous to a temp name
- rename(dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.previous.php', dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.previousTmp.php');
- // rename the current state to ..previous.php
- copy(dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.php', dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.previous.php');
- // rename the previous to the current page
- if(rename(dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.previousTmp.php', dirname(__FILE__).'/../../pages/'.$categoryFolder.$page.'.php')) {
- $messagePopUp .= '<div class="alert alert-info">Revert to the last State</div>';
- GeneralFunctions::removeStoredPage($page);
+
+ $currentState = GeneralFunctions::readPage($page,$category);
+ if(($previousState = GeneralFunctions::readPage($page,$category,true)) !== false) {
+
+ GeneralFunctions::savePage($previousState);
+ GeneralFunctions::savePage($currentState,true);
+
+ $messagePopUp .= '<div class="alert alert-info">'.sprintf($langFile['EDITOR_MESSAGE_RESTOREDTOLASTSTATE'],GeneralFunctions::dateDayBeforeAfter($previousState['lastSaveDate']).' '.formatTime($previousState['lastSaveDate'])).'</div>';
}
+ unset($currentState,$previousState);
}
}
@@ -230,8 +231,10 @@
// -> LOAD PAGE
-if($pageContent = GeneralFunctions::readPage($page,$category))
+if($pageContent = GeneralFunctions::readPage($page,$category)) {
$newPage = false;
+ $previousStatePageContent = GeneralFunctions::readPage($pageContent['id'],$pageContent['category'],true);
+}
// otherwise offer NEW PAGE
else
$newPage = true;
@@ -246,7 +249,7 @@
$activatedPlugins = unserialize($categoryConfig[$category]['plugins']);
// -> check if the thumbnail still exists, if not clear the thumbnail state of the file
-if(!file_exists(DOCUMENTROOT.$adminConfig['uploadPath'].$adminConfig['pageThumbnail']['path'].$pageContent['thumbnail']) && isBlocked() === false) {
+if(!empty($pageContent['thumbnail']) && isBlocked() === false && !file_exists(DOCUMENTROOT.$adminConfig['uploadPath'].$adminConfig['pageThumbnail']['path'].$pageContent['thumbnail'])) {
$pageContent['thumbnail'] = '';
GeneralFunctions::savePage($pageContent);
}
BIN  library/images/buttons/subMenu_restorePage.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  library/images/icons/breadCrumb_page.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
BIN  library/images/icons/revertStateIcon_small.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 library/includes/backend.include.php
View
@@ -135,7 +135,7 @@
// -> SEND BACKEND HEADER
-header('Content-Type:text/html; charset=UTF-8');
-header('Content-Language:'.$_SESSION['feinduraSession']['backendLanguage']);
+// header('Content-Type:text/html; charset=UTF-8');
+// header('Content-Language:'.$_SESSION['feinduraSession']['backendLanguage']);
?>
6 library/includes/editPlugins.leftSideBar.include.php
View
@@ -24,7 +24,7 @@
?>
-<div class="box">
+<div class="box" id="selectPluginsBox">
<h1 class="toolTipTop" title="::<?php echo sprintf($langFile['EDITOR_TEXT_EDITPLUGINSINEDITOR'],'[i class=\'icons codeSnippets\'][/i]'); ?>"><img src="library/images/icons/pluginsIcon_middle.png" alt="icon" style="position:relative; top:-2px; margin-right:0px;"><?php echo $langFile['EDITOR_pluginSettings_h1']; ?></h1>
<ul class="jsMultipleSelect resizeOnHover" data-jsMultipleSelect="plugins" data-name="newPlugins" data-type="duplicates">
<li class="filter"><input type="text" placeholder="<?php echo $langFile['SORTABLEPAGELIST_headText1']; ?>"></li>
@@ -168,6 +168,10 @@
// ADD PLUGIN to the EDITOR
HTMLEditor.insertHtml(clone.retrieve('pluginPlaceholder').getString());
+
+ // fix the WEBKIT BUG, when selecting, that it scrolls
+ if(Browser.chrome || Browser.safari)
+ new Fx.Scroll(window.document,{duration:0}).toElement($('selectPluginsBox'));
});
// REMOVE
2  library/includes/editor.include.php
View
@@ -214,6 +214,6 @@
include(dirname(__FILE__).'/pageMetaData.include.php');
?>
- <input type="submit" value="" id="HTMLEditorSubmit" class="button submit center" title="<?php echo $langFile['FORM_BUTTON_SUBMIT']; ?>" onclick="$('savedBlock').value = 'pageSettings'; submitAnchor('editorForm','pageSettings');">
+ <input type="submit" value="" class="button submit center" title="<?php echo $langFile['FORM_BUTTON_SUBMIT']; ?>" onclick="$('savedBlock').value = 'pageSettings'; submitAnchor('editorForm','pageSettings');">
</div>
</div>
44 library/javascripts/content.js
View
@@ -204,7 +204,7 @@ function removeChecked(selector) {
// -------------------------------------------------
// RESIZE ELEMENTS ON HOVER
-function resizeElementsOnHover() {
+function resizeOnHover() {
// vars
var startSize = 100;
@@ -217,8 +217,9 @@ function resizeElementsOnHover() {
var parentBox = element.getParents('div.box');
if(typeOf(parentBox[0]) !== 'null') {
- parentBox[0].grab(new Element('div',{'class':'spacer arrow'}));
- parentBox[0].addEvents({
+ var arrow = new Element('div',{'class':'spacer arrow'});
+ parentBox[0].grab(arrow);
+ arrow.addEvents({
'mouseenter': function(){
element.tween('height',orgSize);
},
@@ -448,7 +449,6 @@ function sidebarMenu() {
// -> sets the RESIZE-TWEEN to the sideBarMenu
sideBarMenu.set('tween', {duration: '650', transition: Fx.Transitions.Pow.easeOut});
-
});
}
@@ -568,7 +568,7 @@ window.addEvent('domready', function() {
new jsMultipleSelect();
// slide out elements on hover
- resizeElementsOnHover();
+ resizeOnHover();
// STORES all pages LI ELEMENTS
listPagesBars = $$('div.block.listPagesBlock li');
@@ -614,7 +614,7 @@ window.addEvent('domready', function() {
});
// ADD .active to links which get clicked
- $$('#rightSidebar a').addEvent('click',function(){
+ $$('#rightSidebar .menuWrapper a').addEvent('click',function(){
if(this.hasClass('btn'))
return;
$$('#rightSidebar a').removeClass('active');
@@ -662,7 +662,7 @@ window.addEvent('domready', function() {
feindura_storeTipTexts('#currentVisitorsSideBar .toolTipLeft, #currentVisitorsSideBar .toolTipRight');
toolTipsLeft.attach('#currentVisitorsSideBar .toolTipLeft');
toolTipsRight.attach('#currentVisitorsSideBar .toolTipRight');
- resizeElementsOnHover();
+ resizeOnHover();
} else
$('currentVisitorsSideBar').empty();
}
@@ -1339,8 +1339,6 @@ window.addEvent('domready', function() {
var editorToHeight = (window.getSize().y * 0.60 > 420) ? window.getSize().y * 0.60 : 420;
var editorHasFocus = false;
var editorIsClicked = false;
- var editorSubmited = false;
- var editorSubmitHeight = $('HTMLEditorSubmit').getSize().y;
// ------------------------------
// CONFIG the HTMlEditor
@@ -1448,7 +1446,7 @@ window.addEvent('domready', function() {
$$('div.editor #cke_HTMLEditor').addEvent('click',function(e){
// clearTimeout(editorTweenTimeout);
- if(!editorHasFocus && !editorSubmited && ckeditorContent.getHeight() <= (editorStartHeight+20))
+ if(!editorHasFocus && ckeditorContent.getHeight() <= (editorStartHeight+20))
HTMLEditor.resize(798,editorToHeight + 100);
if(!editorHasFocus && typeOf(ckeditorToolBar) !== 'null' && ckeditorToolBar.getStyle('display') === 'none') {
@@ -1460,26 +1458,18 @@ window.addEvent('domready', function() {
}
// scroll to editor
- // if($('editorAnchor') !== 'null')
- // windowScroll.toElement($('editorAnchor'));
+ if($('editorAnchor') !== 'null')
+ windowScroll.toElement($('editorAnchor'));
editorHasFocus = true;
});
- // $$('div.editor #cke_HTMLEditor').addEvent('mouseenter',function(e){
- // if(!editorIsClicked && !editorSubmited && !editorHasFocus && ckeditorContent.getHeight() <= (editorStartHeight+20))
- // editorTweenTimeout = (function(){ckeditorContent.tween('height',editorToHeight);}).delay(1000);
- // });
- // $$('div.editor #cke_HTMLEditor').addEvent('mouseleave',function(e){
- // clearTimeout(editorTweenTimeout);
- // if(!editorIsClicked && !editorSubmited && !editorHasFocus && ckeditorContent.getHeight() <= (editorToHeight+5) && ckeditorContent.getHeight() >= (editorToHeight-5))
- // ckeditorContent.tween('height',editorStartHeight);
- // //editorIsClicked = false;
- // });
-
- HTMLEditor.on('focus',function() {
+
+ HTMLEditor.on('focus',function(e) {
// clearTimeout(editorTweenTimeout);
+ if(editorHasFocus)
+ return;
- if(!editorHasFocus && !editorSubmited && ckeditorContent.getHeight() <= (editorStartHeight+20)) {
+ if(!editorHasFocus && ckeditorContent.getHeight() <= (editorStartHeight+20)) {
HTMLEditor.resize(798,editorToHeight + 100);
}
@@ -1497,10 +1487,6 @@ window.addEvent('domready', function() {
editorHasFocus = true;
});
-
- $('HTMLEditorSubmit').addEvent('mousedown',function(e) {
- editorSubmited = true;
- });
});
}
// ->> make PAGE TITLE EDITABLE
2  library/javascripts/loading.js
View
@@ -39,7 +39,7 @@ function showDocumentSaved() {
}
// create loading circle container
-var jsLoadingCircleContainer = new Element('div', {'style': 'position: relative;margin: auto;width: 100%;height: 100%;'});
+var jsLoadingCircleContainer = new Element('div', {'style': 'position: relative;top:4px;margin: auto;width: 100%;height: 100%;'});
var removeLoadingCircle = feindura_loadingCircle(jsLoadingCircleContainer, 18, 30, 12, 4, "#000");
// ->> LOADING CIRCLE FUNCTIONS
8 library/languages/de.backend.php
View
@@ -138,8 +138,8 @@
$langFile['STATISTICS_TEXT_VISITTIME_MAX'] = 'Längste Verweildauer';
$langFile['STATISTICS_TEXT_VISITTIME_MIN'] = 'Kürzeste Verweildauer';
-$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'Erster Besuch';
-$langFile['STATISTICS_TEXT_LASTVISIT'] = 'Letzter Besuch';
+$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'von';
+$langFile['STATISTICS_TEXT_LASTVISIT'] = 'bis';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Es hat noch niemand diese Seite besucht.';
$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::Die von
Google, Yahoo oder Bing (MSN) auf diese Seite geführt haben">Suchworte</span>';
@@ -692,7 +692,7 @@
// ---------- page info
$langFile['EDITOR_TITLE_CREATEPAGE'] = 'Neue Seite erstellen';
$langFile['EDITOR_TITLE_ADDLANGUAGE'] = 'Sprache &quot;%s&quot; zur Seite hinzufügen';
-$langFile['EDITOR_pageinfo_lastsavedate'] = 'zuletzt bearbeitet am';
+$langFile['EDITOR_pageinfo_lastsavedate'] = 'zuletzt bearbeitet';
$langFile['EDITOR_pageinfo_lastsaveauthor'] = 'von';
$langFile['EDITOR_pageinfo_linktothispage'] = 'Link zu dieser Seite';
$langFile['EDITOR_pageinfo_id'] = 'Seiten ID';
@@ -733,6 +733,8 @@
$langFile['EDITOR_TEXT_SUBCATEGORY'] = 'Unterkategorie';
$langFile['EDITOR_TIP_SUBCATEGORY'] = 'Erlaubt, in der Webseite, das erstellen eines Untermenüs für diese Seite.';
+$langFile['EDITOR_BUTTON_RESTORELASTSTATE'] = 'Version von %s wiederherstellen';
+$langFile['EDITOR_MESSAGE_RESTOREDTOLASTSTATE'] = 'Version von %s wiederhergestellt.';
// ---------- page advanced settings
$langFile['EDITOR_advancedpageSettings_h1'] = 'Seitenspezifische HTML-Editor-Einstellungen';
6 library/languages/en.backend.php
View
@@ -138,8 +138,8 @@
$langFile['STATISTICS_TEXT_VISITTIME_MAX'] = 'longest length of stay';
$langFile['STATISTICS_TEXT_VISITTIME_MIN'] = 'shortest length of stay';
-$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'first visit';
-$langFile['STATISTICS_TEXT_LASTVISIT'] = 'last visit';
+$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'from';
+$langFile['STATISTICS_TEXT_LASTVISIT'] = 'to';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Yet nobody visit this website.';
$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::Which led from
Google, Yahoo or Bing (MSN) to this website.">Searchwords</span>';
@@ -734,6 +734,8 @@
$langFile['EDITOR_TEXT_SUBCATEGORY'] = 'Subcategory';
$langFile['EDITOR_TIP_SUBCATEGORY'] = 'Allows to create a sub menu for this page in the website.';
+$langFile['EDITOR_BUTTON_RESTORELASTSTATE'] = 'Restore to the version from %s';
+$langFile['EDITOR_MESSAGE_RESTOREDTOLASTSTATE'] = 'To version from %s restored.';
// ---------- page advanced settings
$langFile['EDITOR_advancedpageSettings_h1'] = 'Page specific HTML-Editor-Settings';
7 library/languages/fr.backend.php
View
@@ -134,8 +134,8 @@
$langFile['STATISTICS_TEXT_VISITTIME_MAX'] = 'temps de visite le plus longs';
$langFile['STATISTICS_TEXT_VISITTIME_MIN'] = 'temps de visite le plus court';
-$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'première visite';
-$langFile['STATISTICS_TEXT_LASTVISIT'] = 'dernière visite';
+$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'de';
+$langFile['STATISTICS_TEXT_LASTVISIT'] = 'à';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Personne a visité ce site web.';
$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::Qui ont mèné
Google, Yahoo ou Bing (MSN) sur ce site web">Mot de recherche</span>';
@@ -701,6 +701,9 @@
$langFile['EDITOR_TEXT_SUBCATEGORY'] = 'Sous-catégorie';
$langFile['EDITOR_TIP_SUBCATEGORY'] = 'Permet de créer un sous-menu pour cette page sur le site.';
+$langFile['EDITOR_BUTTON_RESTORELASTSTATE'] = 'Restaurer la version de %s';
+$langFile['EDITOR_MESSAGE_RESTOREDTOLASTSTATE'] = 'Version de %s restaurée.';
+
// ---------- page advanced settings
$langFile['EDITOR_advancedpageSettings_h1'] = 'paramètres spécifique de la page de l&#145;éditor HTML';
$langFile['EDITOR_advancedpageSettings_field1'] = 'page fichier feuille de style';
7 library/languages/it.backend.php
View
@@ -138,8 +138,8 @@
$langFile['STATISTICS_TEXT_VISITTIME_MAX'] = 'permanenza più lunga';
$langFile['STATISTICS_TEXT_VISITTIME_MIN'] = 'permanenza più breve ';
-$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'prima visita';
-$langFile['STATISTICS_TEXT_LASTVISIT'] = 'ultima visita';
+$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'da';
+$langFile['STATISTICS_TEXT_LASTVISIT'] = 'a';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Nessuno mai ancora ha visito questo sito.';
$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::Che hanno portato da
Google, Yahoo o Bing (MSN) a questo sito.">Parole di ricerca</span>';
@@ -736,6 +736,9 @@
$langFile['EDITOR_TEXT_SUBCATEGORY'] = 'Sottocategoria';
$langFile['EDITOR_TIP_SUBCATEGORY'] = 'Permette di creare un menù secondario per questa pagina nel sito.';
+$langFile['EDITOR_BUTTON_RESTORELASTSTATE'] = 'Ripristinare la versione di %s';
+$langFile['EDITOR_MESSAGE_RESTOREDTOLASTSTATE'] = 'Versione di %s restaurata.';
+
// ---------- page advanced settings
$langFile['EDITOR_advancedpageSettings_h1'] = 'Pagina specifica impostazioni-Editor-HTML';
7 library/languages/ru.backend.php
View
@@ -140,8 +140,8 @@
$langFile['STATISTICS_TEXT_VISITTIME_MAX'] = 'самые продолжительные визиты';
$langFile['STATISTICS_TEXT_VISITTIME_MIN'] = 'самые короткие визиты';
-$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'первое посещение';
-$langFile['STATISTICS_TEXT_LASTVISIT'] = 'последнее посещение';
+$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'с';
+$langFile['STATISTICS_TEXT_LASTVISIT'] = 'до';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Еще никто не посещал сайт.';
$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::По которым приходят из
Google, Yahoo или Bing (MSN) на сайт.">Ключевые слова</span>';
@@ -741,6 +741,9 @@
$langFile['EDITOR_TEXT_SUBCATEGORY'] = 'подкатегория';
$langFile['EDITOR_TIP_SUBCATEGORY'] = 'Позволяет создавать подменю для этой страницы на сайте.';
+$langFile['EDITOR_BUTTON_RESTORELASTSTATE'] = 'Версия %s восстановление';
+$langFile['EDITOR_MESSAGE_RESTOREDTOLASTSTATE'] = 'Версия %s восстановлено.';
+
// ---------- page advanced settings
$langFile['EDITOR_advancedpageSettings_h1'] = 'Страница конкретной HTML-редактор Настройка';
2  library/leftSidebar.loader.php
View
@@ -159,7 +159,7 @@
<h1><img src="library/images/icons/thumbnailIcon_middle.png" alt="icon" style="position:relative; top:-4px; margin-right:5px;"><?php echo $langFile['THUMBNAIL_TEXT_NAME']; ?></h1>
<?php
- $thumbnailPath = (!empty($pageContent['thumbnail'] )) ? GeneralFunctions::Path2URI($adminConfig['uploadPath']).$adminConfig['pageThumbnail']['path'].$pageContent['thumbnail'] : '#';
+ $thumbnailPath = (!empty($pageContent['thumbnail'] )) ? GeneralFunctions::Path2URI($adminConfig['uploadPath']).$adminConfig['pageThumbnail']['path'].$pageContent['thumbnail'] : '';
// -> show THUMBNAIL if the page has one
$displayThumbnailContainer = ' display:none;';
7 library/styles/less/general.less
View
@@ -516,6 +516,11 @@ menu.vertical {
padding-right: 2px;
}
+ img[alt="flag"] {
+ position: relative;
+ top: -1px;
+ }
+
li:hover,
tr:hover {
background-color: #fff;
@@ -664,6 +669,8 @@ div.divBlocked {
margin: 0;
margin-top: 20px;
text-align: center;
+ font-weight: bold;
+ font-size: 15px;
#shadow > .drop(0,3px,15px,0.2);
}
}
5 library/styles/less/icons.less
View
@@ -47,4 +47,9 @@
height: 25px;
background: url("../images/icons/breadCrumb_category.png") no-repeat;
}
+ &.revertState {
+ width: 27px;
+ height: 27px;
+ background: url("../images/icons/revertStateIcon_small.png") no-repeat;
+ }
}
17 library/styles/less/layout.less
View
@@ -210,13 +210,13 @@ header.main {
background-position: 0px -21px !important;
}
- a.de {
+ a.en {
left: 0px;
- background: url("../images/buttons/langSelection_de.png") no-repeat;
+ background: url("../images/buttons/langSelection_en.png") no-repeat;
}
- a.en {
+ a.de {
left: 30px;
- background: url("../images/buttons/langSelection_en.png") no-repeat;
+ background: url("../images/buttons/langSelection_de.png") no-repeat;
}
a.fr {
left: 60px;
@@ -417,7 +417,7 @@ header.main {
li {
height: 40px;
- margin: 0 4px;
+ margin: 0 2px;
&:hover {
background-color: rgba(0,0,0,0.1);
@@ -429,14 +429,14 @@ header.main {
top: 0;
width: 6px;
height: 40px;
- margin: 0 -4px;
+ margin: 0 -2px;
background: url("../images/buttons/subMenu_spacer.png") no-repeat center center;
}
// submenu buttons
li a {
display: block;
- margin: 0 2px;
+ margin: 0;
padding: 0;
width: 42px !important;
height: 40px;
@@ -479,6 +479,9 @@ header.main {
a.submit {
background: url("../images/buttons/subMenu_submit.png") no-repeat;
}
+ a.restorePage {
+ background: url("../images/buttons/subMenu_restorePage.png") no-repeat;
+ }
}
}
27 library/styles/less/page_editor.less
View
@@ -47,7 +47,7 @@ div.rteHide {
.breadCrumbs {
position: relative;
- margin: 10px 0;
+ margin: 10px;
a {
position: relative;
@@ -115,13 +115,28 @@ div.rteHide {
.revertPageToLastStateBox {
z-index: 1;
position: absolute;
- right: 15px;
- margin-top: -10px;
display: inline-block;
+ right: 5px;
+ margin-top: -20px;
padding: 10px;
- background-color: #333;
- #border > .rounded(@borderRadiusMedium);
- #shadow > .drop(0,0,10px,0.3);
+
+ > div {
+ padding: 10px;
+ background-color: #333;
+ #border > .rounded(@borderRadiusMedium);
+ #shadow > .drop(0,0,10px,0.3);
+ }
+
+ a.btn {
+ line-height: 25px;
+ padding-left: 30px;
+
+ i.revertState {
+ position: absolute;
+ top: 23px;
+ left: 22px;
+ }
+ }
}
#leftSidebar {
46 library/styles/styles.css
View
@@ -4796,6 +4796,10 @@
padding-left: 5px;
padding-right: 2px;
}
+.feindura .coloredList img[alt="flag"] {
+ position: relative;
+ top: -1px;
+}
.feindura .coloredList li:hover,
.feindura .coloredList tr:hover {
background-color: #fff;
@@ -5027,6 +5031,8 @@
margin: 0;
margin-top: 20px;
text-align: center;
+ font-weight: bold;
+ font-size: 15px;
-webkit-box-shadow: 0 3px 15px rgba(0, 0, 0, 0.19999999999999996);
-moz-box-shadow: 0 3px 15px rgba(0, 0, 0, 0.19999999999999996);
box-shadow: 0 3px 15px rgba(0, 0, 0, 0.19999999999999996);
@@ -6005,13 +6011,13 @@
.feindura header.main .languageSelection a:focus {
background-position: 0px -21px !important;
}
-.feindura header.main .languageSelection a.de {
+.feindura header.main .languageSelection a.en {
left: 0px;
- background: url("../images/buttons/langSelection_de.png") no-repeat;
+ background: url("../images/buttons/langSelection_en.png") no-repeat;
}
-.feindura header.main .languageSelection a.en {
+.feindura header.main .languageSelection a.de {
left: 30px;
- background: url("../images/buttons/langSelection_en.png") no-repeat;
+ background: url("../images/buttons/langSelection_de.png") no-repeat;
}
.feindura header.main .languageSelection a.fr {
left: 60px;
@@ -6206,7 +6212,7 @@
}
.feindura .mainBody .subMenu li {
height: 40px;
- margin: 0 4px;
+ margin: 0 2px;
}
.feindura .mainBody .subMenu li:hover {
background-color: rgba(0, 0, 0, 0.1);
@@ -6216,12 +6222,12 @@
top: 0;
width: 6px;
height: 40px;
- margin: 0 -4px;
+ margin: 0 -2px;
background: url("../images/buttons/subMenu_spacer.png") no-repeat center center;
}
.feindura .mainBody .subMenu li a {
display: block;
- margin: 0 2px;
+ margin: 0;
padding: 0;
width: 42px !important;
height: 40px;
@@ -6259,6 +6265,9 @@
.feindura .mainBody .subMenu a.submit {
background: url("../images/buttons/subMenu_submit.png") no-repeat;
}
+.feindura .mainBody .subMenu a.restorePage {
+ background: url("../images/buttons/subMenu_restorePage.png") no-repeat;
+}
.feindura footer.main {
position: relative;
z-index: 1;
@@ -6893,6 +6902,11 @@
height: 25px;
background: url("../images/icons/breadCrumb_category.png") no-repeat;
}
+.feindura .icons.revertState {
+ width: 27px;
+ height: 27px;
+ background: url("../images/icons/revertStateIcon_small.png") no-repeat;
+}
.feindura .mainContent .block {
z-index: 1;
position: relative;
@@ -8111,7 +8125,7 @@
}
.feindura .breadCrumbs {
position: relative;
- margin: 10px 0;
+ margin: 10px;
}
.feindura .breadCrumbs a {
position: relative;
@@ -8179,9 +8193,12 @@
.feindura .revertPageToLastStateBox {
z-index: 1;
position: absolute;
- right: 15px;
- margin-top: -10px;
display: inline-block;
+ right: 5px;
+ margin-top: -20px;
+ padding: 10px;
+}
+.feindura .revertPageToLastStateBox > div {
padding: 10px;
background-color: #333;
-webkit-border-radius: 5px;
@@ -8194,6 +8211,15 @@
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.30000000000000004);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.30000000000000004);
}
+.feindura .revertPageToLastStateBox a.btn {
+ line-height: 25px;
+ padding-left: 30px;
+}
+.feindura .revertPageToLastStateBox a.btn i.revertState {
+ position: absolute;
+ top: 23px;
+ left: 22px;
+}
.feindura #leftSidebar a.uploadPageThumbnail {
display: inline-block;
width: 90px;
2  library/thirdparty/ckeditor/plugins/feinduraSnippets/plugin.js
View
@@ -83,7 +83,7 @@ CKEDITOR.plugins.add('feinduraSnippets',
elem = editor.document.createElement('img'); //set inital values for the input.supNote element
// elem.setAttribute('src',feindura_basePath.replace(feindura_websitePath,'')+'library/thirdparty/ckeditor/plugins/feinduraSnippets/snippetFill.gif');
- elem.setAttribute('src','#');
+ elem.setAttribute('src','noImage.png');
elem.setAttribute('draggable','true');
editor.insertElement(elem);
this.snippet = elem;
15 library/views/editor.php
View
@@ -98,7 +98,7 @@
<input type="hidden" name="id" value="'.$_GET['page'].'">
<input type="hidden" name="websiteLanguage" value="'.$_SESSION['feinduraSession']['websiteLanguage'].'">
<input type="hidden" name="status" value="'.$_GET['status'].'">
- <input type="hidden" name="savedBlock" id="savedBlock" value="">
+ <input type="hidden" name="savedBlock" id="savedBlock" value="editor">
</div>';
?>
@@ -318,18 +318,15 @@
if(!$newPage) {
// show the PREVIOUS STATE of the PAGE button
- $categoryFolder = ($pageContent['category'] == 0) ? '' : $pageContent['category'].'/';
- if(file_exists(dirname(__FILE__).'/../../pages/'.$categoryFolder.$pageContent['id'].'.previous.php')) {
- $previousPageContent = GeneralFunctions::readPage($pageContent['id'],$pageContent['category'],true);
- echo '<div class="revertPageToLastStateBox"><a href="index.php?category='.$pageContent['category'].'&amp;page='.$pageContent['id'].'&amp;status=revertToPreviousState&amp;reload='.rand(0,999).'#editorAnchor" class="btn btn-inverse">Made a mistake? Go back to the last Page Version von '.GeneralFunctions::dateDayBeforeAfter($previousPageContent['lastSaveDate']).' '.formatTime($previousPageContent['lastSaveDate']).'</a></div>';
- unset($previousPageContent);
+ if($previousStatePageContent) {
+ $showPreviousStateBlock = ($savedForm) ? ' style="margin-top:-55px;"':'';
+ echo '<div class="revertPageToLastStateBox"'.$showPreviousStateBlock.'><div><a href="index.php?category='.$pageContent['category'].'&amp;page='.$pageContent['id'].'&amp;status=revertToPreviousState&amp;reload='.rand(0,999).'#editorAnchor" class="btn btn-inverse"><i class="icons revertState"></i>'.sprintf($langFile['EDITOR_BUTTON_RESTORELASTSTATE'],GeneralFunctions::dateDayBeforeAfter($previousStatePageContent['lastSaveDate']).' '.formatTime($previousStatePageContent['lastSaveDate'])).'</a></div></div>';
}
// INCLUDE the EDITOR
include_once(dirname(__FILE__).'/../includes/editor.include.php');
}
-
if($newPage) {
?>
<!-- ***** PAGE SETTINGS on NEW PAGE -->
@@ -418,10 +415,10 @@
$$('.revertPageToLastStateBox').addEvents({
'mouseenter': function(){
- this.tween('margin-top','-40px');
+ this.tween('margin-top','-55px');
},
'mouseleave': function(){
- this.tween('margin-top','-10px');
+ this.tween('margin-top','-20px');
}
});
2  update.php
View
@@ -31,7 +31,7 @@
error_reporting(E_ALL ^ E_NOTICE);
$NEWVERSION = '2.0 beta';
-$NEWBUILD = 969;
+$NEWBUILD = 970;
// gets the version of the feindura CMS
if($prevVersionFile = file(dirname(__FILE__).'/VERSION')) {
Please sign in to comment.
Something went wrong with that request. Please try again.