Permalink
Browse files

build 958: moved statistics to the timeline

  • Loading branch information...
1 parent b084430 commit 5837b1e10272bc4795d77bf4f55e2b5865818b5b @frozeman committed Jul 26, 2012
Showing with 743 additions and 759 deletions.
  1. +2 −1 CHANGELOG
  2. +1 −1 VERSION
  3. +5 −4 index.php
  4. +25 −10 library/classes/Search.class.php
  5. +3 −3 library/controllers/editor.controller.php
  6. +1 −1 library/controllers/thumbnailUpload.controller.php
  7. +1 −1 library/functions/backend.functions.php
  8. BIN library/images/buttons/content_uploadPageThumbnail.png
  9. BIN library/images/buttons/thumbnailUpload.png
  10. +57 −113 library/includes/editor.include.php
  11. +12 −8 library/includes/secure.include.php
  12. +19 −51 library/javascripts/content.js
  13. +6 −6 library/javascripts/windowBox.js
  14. +6 −7 library/languages/de.backend.php
  15. +6 −7 library/languages/en.backend.php
  16. +6 −7 library/languages/fr.backend.php
  17. +7 −8 library/languages/it.backend.php
  18. +10 −11 library/languages/ru.backend.php
  19. +6 −3 library/leftSidebar.loader.php
  20. +267 −88 library/rightSidebar.loader.php
  21. +0 −6 library/styles/less/contentBlocks.less
  22. +33 −1 library/styles/less/general.less
  23. +32 −18 library/styles/less/layout.less
  24. +0 −14 library/styles/less/page_dashboard.less
  25. +9 −15 library/styles/less/page_editor.less
  26. +1 −1 library/styles/less/thirdpartyFixes.less
  27. +72 −51 library/styles/styles.css
  28. +143 −158 library/thirdparty/javascripts/jsMultipleSelect.js
  29. +3 −153 library/views/editor.php
  30. +2 −2 library/views/listPages.php
  31. +1 −0 library/views/search.php
  32. +1 −1 library/views/windowBox/deletePageThumbnail.php
  33. +4 −8 library/views/windowBox/uploadPageThumbnail.php
  34. +2 −1 update.php
View
3 CHANGELOG
@@ -1,7 +1,7 @@
feindura - Flat File Content Management System
Version
2.0
-Build 957
+Build 958
==================================================
Copyright (C) Fabian Vogelsteller [frozeman.de]
published under the GNU General Public License version 3
@@ -24,6 +24,7 @@ ChangeLog:
2.0
+ build 958: moved statistics to the timeline
build 957: implemented user permissions (hopefully complete :\)
build 956: changed login page to pure css
build 955: add messagePopUp to display status messages
View
2 VERSION
@@ -1,3 +1,3 @@
This file is necessary for the next feindura update. Do not delete it!
2.0
-957
+958
View
9 index.php
@@ -380,7 +380,7 @@
<a href="http://feindura.org" class="feinduraLogo" target="_blank"></a>
<div class="feinduraVersion toolTipRight" title="<?php echo $langFile['LOGO_TEXT'].' '.VERSION.' - Build '.BUILD; ?>::"><?php echo VERSION; ?></div>
- <nav class="mainMenu"<?php if(!GeneralFunctions::isAdmin()) echo ' style="width:830px"'; ?>>
+ <nav class="mainMenu">
<table>
<tbody>
<tr>
@@ -390,8 +390,10 @@
// CHECKS if the addons/ folder is empty
if(!GeneralFunctions::folderIsEmpty(dirname(__FILE__).'/addons/')) { ?>
<td><a href="?site=addons" tabindex="5" accesskey="a" class="addons<?php if($_GET['site'] == 'addons') echo ' active'; ?>" title="<?php echo $langFile['BUTTON_ADDONS']; ?> (A)"><span><?php echo $langFile['BUTTON_ADDONS']; ?></span></a></td>
- <?php } ?>
+ <?php }
+ if(GeneralFunctions::hasPermission('websiteSettings')) { ?>
<td><a href="?site=websiteSetup" tabindex="6" accesskey="w" class="websiteSetup<?php if($_GET['site'] == 'websiteSetup') echo ' active'; ?>" title="<?php echo $langFile['BUTTON_WEBSITESETTINGS']; ?> (W)"><span><?php echo $langFile['BUTTON_WEBSITESETTINGS']; ?></span></a></td>
+ <?php } ?>
<td><a href="?site=search" tabindex="7" accesskey="s" class="search<?php if($_GET['site'] == 'search') echo ' active'; ?>" title="<?php echo $langFile['BUTTON_SEARCH']; ?> (S)"><span><?php echo $langFile['BUTTON_SEARCH']; ?></span></a></td>
</tr>
</tbody>
@@ -621,7 +623,6 @@
include('library/content.loader.php');
?>
- <a href="#top" class="fastUp" title="<?php echo $langFile['BUTTON_UP']; ?>"></a>
</div>
@@ -635,7 +636,7 @@
?>
</div>
-
+ <a href="#top" class="fastUp" title="<?php echo $langFile['BUTTON_UP']; ?>"></a>
</div>
<!-- ******************************************************************************************* -->
View
35 library/classes/Search.class.php
@@ -30,9 +30,10 @@
*
* @package [Backend]
*
-* @version 1.2
+* @version 1.3
* <br>
* <b>ChangeLog</b><br>
+* - 1.3 add {@link Search::$checkPermissions}
* - 1.2 fixed search word pattern
* - 1.1 add localization and $language + $searchAllLanguages property
* - 1.0 initial release
@@ -119,6 +120,14 @@ class Search {
public $checkIfPublic = true;
/**
+ * If TRUE it will check if the current user has the right to edit the searched page.
+ *
+ * @var bool
+ * @access public
+ */
+ public $checkPermissions = false;
+
+ /**
* if TRUE it also search in the category names.
*
* @var bool
@@ -220,7 +229,7 @@ public function find($searchwords, $category = true) {
* @param string $searchwords one or more searchwords to fing
* @param bool|int|array $category the ID or an array with IDs of the category(ies) in which should be searched, if TRUE it searches in all categories, if FALSE it searches only in the non category
*
- * @uses $checkPages if TRUE it searches only in pages which are public
+ * @uses Search::$checkIfPublic if TRUE it searches only in pages which are public
* @uses sortByPriority() to sort the page array
* @uses GeneralFunctions::isPublicCategory() to check if the category is public
* @uses GeneralFunctions::loadPages() to load the pages
@@ -247,18 +256,24 @@ protected function searchPages($searchwords, $category) {
// -> load the pages
$pages = GeneralFunctions::loadPages($category);
- // -> check if the pages are public
+ // -> CHECK if the pages are PUBLIC
if($this->checkIfPublic) {
- $checkPages = array();
- foreach($pages as $page) {
- if($page['public'] == true)
- $checkPages[] = $page;
+ foreach($pages as $key => $page) {
+ if(!$page['public'])
+ unset($pages[$key]);
}
- } else
- $checkPages = $pages;
+ }
+
+ // -> CHECK if the user has PERMISSIONS to edit these pages
+ if($this->checkPermissions) {
+ foreach($pages as $key => $page) {
+ if(!GeneralFunctions::hasPermission('editablePages',$page['id']))
+ unset($pages[$key]);
+ }
+ }
// ->> goes through all pages and search for the keywords
- foreach($checkPages as $pageContent) {
+ foreach($pages as $pageContent) {
// var
$changeChars = array(' ','.','-','/');
View
6 library/controllers/editor.controller.php
@@ -29,7 +29,7 @@
// SAVE the PAGE
// -----------------------------------------------------------------------------
-if($_POST['save'] && isBlocked() === false && GeneralFunctions::hasPermission('editablePages',$page)) {
+if($_POST['save'] && isBlocked() === false) {
// vars
$page = $_POST['id'];
@@ -175,8 +175,8 @@
}
-// -> LOAD PAGE only if USER have PERMISSION for that PAGE or CATEGORY
-if(GeneralFunctions::hasPermission('editablePages',$page) && $pageContent = GeneralFunctions::readPage($page,$category))
+// -> LOAD PAGE
+if($pageContent = GeneralFunctions::readPage($page,$category))
$newPage = false;
// otherwise offer NEW PAGE
else
View
2 library/controllers/thumbnailUpload.controller.php
@@ -235,7 +235,7 @@
// call this javascript, on the succesfull finish of the upload
echo '<script type="text/javascript">
/* <![CDATA[ */
- window.top.window.finishThumbnailUpload('.$frameHeight.',"'.$newFileName.$randomImage.'",'.$thumbSize[0].');
+ window.top.window.finishThumbnailUpload('.$frameHeight.',"'.$newFileName.$randomImage.'");
/* ]]> */
</script>';
}
View
2 library/functions/backend.functions.php
@@ -3101,7 +3101,7 @@ function createTagCloud($serializedTags,$minFontSize = 10,$maxFontSize = 20) {
// create href
$tagsHref = urlencode(html_entity_decode($tag['data'],ENT_QUOTES,'UTF-8'));
- $return .= '<a href="?site=search&amp;search='.$tagsHref.'" style="font-size:'.$fontSize.'px;" class="toolTipLeft" title="[span]&quot;'.$tag['data'].'&quot;[/span] '.$GLOBALS['langFile']['STATISTICS_TEXT_SEARCHWORD_PART1'].' [span]'.$tag['number'].'[/span] '.$GLOBALS['langFile']['STATISTICS_TEXT_SEARCHWORD_PART2'].'::'.$GLOBALS['langFile']['STATISTICS_TOOLTIP_SEARCHWORD'].'">'.$tag['data'].'</a>&nbsp;&nbsp;'."\n"; //<span style="color:#888888;">('.$tag['number'].')</span>
+ $return .= '<a href="?site=search&amp;search='.$tagsHref.'" style="font-size:'.$fontSize.'px;" class="toolTipTop" title="[span]&quot;'.$tag['data'].'&quot;[/span] '.$GLOBALS['langFile']['STATISTICS_TEXT_SEARCHWORD_PART1'].' [span]'.$tag['number'].'[/span] '.$GLOBALS['langFile']['STATISTICS_TEXT_SEARCHWORD_PART2'].'::'.$GLOBALS['langFile']['STATISTICS_TOOLTIP_SEARCHWORD'].'">'.$tag['data'].'</a>&nbsp;&nbsp;'."\n";
}
}
View
BIN library/images/buttons/content_uploadPageThumbnail.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN library/images/buttons/thumbnailUpload.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
170 library/includes/editor.include.php
@@ -138,119 +138,63 @@
</script>
<div class="content">
-
- <div class="row">
- <div class="span2">
- <span href="#" id="hotKeysToogle" class="down link toolTipRight" title="::[table]
- [tbody]
- [tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field1']; ?>[/strong][/td]
- [td] STRG + A[/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field2']; ?>[/strong][/td]
- [td] STRG + C[/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field3']; ?>[/strong][/td]
- [td]
- STRG + V[/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field4']; ?>[/strong][/td]
- [td]
- STRG + X
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_or']; ?>[/strong] SHIFT + Del[/td]
- [/tr][tr]
- [td colspan=2 style=height: 10px;background-color:#fff;] [/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field5']; ?>[/strong][/td]
- [td] STRG + Z[/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field6']; ?>[/strong][/td]
- [td]
- STRG + Y
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_or']; ?>[/strong] STRG + SHIFT + Z[/td]
- [/tr][tr]
- [td colspan=2 style=height: 10px;background-color:#fff;] [/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field7']; ?>[/strong][/td]
- [td] STRG + L[/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field8']; ?>[/strong][/td]
- [td] STRG + B[/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field9']; ?>[/strong][/td]
- [td] STRG + I[/td]
- [/tr][tr]
- [td]
- [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field10']; ?>[/strong][/td]
- [td] STRG + U[/td]
- [/tr]
- [/tbody]
- [/table]"><?php echo $langFile['EDITOR_htmleditor_hotkeys_h1']; ?></span>
- </div>
-
- <div class="span6">
- <?php
-
- $thumbnailPath = (!empty($pageContent['thumbnail'] )) ? GeneralFunctions::Path2URI($adminConfig['uploadPath']).$adminConfig['pageThumbnail']['path'].$pageContent['thumbnail'] : '#';
-
- // -> show THUMBNAIL if the page has one
- $displayThumbnailContainer = ' display:none;';
- if(!$newPage && $categoryConfig[$pageContent['category']]['thumbnails'] && !empty($pageContent['thumbnail'])) {
-
- $displayThumbnailContainer = '';
- }
-
- // thumb width
- $thumbnailWidth = @getimagesize(DOCUMENTROOT.$adminConfig['uploadPath'].$adminConfig['pageThumbnail']['path'].$pageContent['thumbnail']);
- $thumbnailWidth = $thumbnailWidth[0];
-
- if($thumbnailWidth >= 200)
- $thumbnailWidthStyle = ' style="width:200px;"';
-
-
- // generates a random number to put on the end of the image, to prevent caching
- // $randomImage = '?'.md5(uniqid(rand(),1));
-
- // thumbnailPreviewContainer
- echo '<div id="thumbnailPreviewContainer" style="z-index:5; position:relative; margin-bottom: 10px; float:right; line-height:28px; text-align:center;'.$displayThumbnailContainer.'">';
- echo $langFile['THUMBNAIL_TEXT_NAME'].'<br>';
-
- echo '<div>';
- // see if the thumbnails are activated, add upload/delete buttons
- if($categoryConfig[$pageContent['category']]['thumbnails']) {
- echo '<a 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_TOOLTIP_THUMBNAIL_DELETE'].'::"" class="deleteButton toolTipLeft"></a>';
- echo '<a 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;" class="image">';
- echo '<img src="'.$thumbnailPath.'" id="thumbnailPreviewImage" class="thumbnail"'.$thumbnailWidthStyle.' data-width="'.$thumbnailWidth.'" alt="thumbnail">';
- echo '</a>';
- // if not only show the thumbnailPreviewImage
- } else
- echo '<img src="'.$thumbnailPath.'" id="thumbnailPreviewImage" class="thumbnail"'.$thumbnailWidthStyle.' data-width="'.$thumbnailWidth.'" alt="thumbnail">';
-
- echo '</div>';
- echo '</div>';
-
- // -> show the thumbnail upload button if there is no thumbnail yet
- $displayThumbnailUploadButton = (!$newPage && $categoryConfig[$pageContent['category']]['thumbnails'] && empty($pageContent['thumbnail']))
- ? '' : ' style="display:none;"';
-
- // thumbnailUploadButtonInPreviewArea
- echo '<a href="?site=uploadPageThumbnail&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" id="thumbnailUploadButtonInPreviewArea" 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_TOOLTIP_THUMBNAIL_UPLOAD'].'::" class="uploadPageThumbnail toolTipLeft"'.$displayThumbnailUploadButton.'></a>';
-
-
- ?>
- </div>
- </div>
- </div>
+ <span id="hotKeysToogle" class="down link toolTipRight" title="::[table]
+ [tbody]
+ [tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field1']; ?>[/strong][/td]
+ [td] STRG + A[/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field2']; ?>[/strong][/td]
+ [td] STRG + C[/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field3']; ?>[/strong][/td]
+ [td]
+ STRG + V[/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field4']; ?>[/strong][/td]
+ [td]
+ STRG + X
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_or']; ?>[/strong] SHIFT + Del[/td]
+ [/tr][tr]
+ [td colspan=2 style=height: 10px;background-color:#fff;] [/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field5']; ?>[/strong][/td]
+ [td] STRG + Z[/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field6']; ?>[/strong][/td]
+ [td]
+ STRG + Y
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_or']; ?>[/strong] STRG + SHIFT + Z[/td]
+ [/tr][tr]
+ [td colspan=2 style=height: 10px;background-color:#fff;] [/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field7']; ?>[/strong][/td]
+ [td] STRG + L[/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field8']; ?>[/strong][/td]
+ [td] STRG + B[/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field9']; ?>[/strong][/td]
+ [td] STRG + I[/td]
+ [/tr][tr]
+ [td]
+ [strong]<?php echo $langFile['EDITOR_htmleditor_hotkeys_field10']; ?>[/strong][/td]
+ [td] STRG + U[/td]
+ [/tr]
+ [/tbody]
+ [/table]">
+ <?php echo $langFile['EDITOR_htmleditor_hotkeys_h1']; ?>
+ </span>
<input type="submit" value="" id="HTMLEditorSubmit" class="button submit center" title="<?php echo $langFile['FORM_BUTTON_SUBMIT']; ?>">
- <br><br>
+ </div>
</div>
View
20 library/includes/secure.include.php
@@ -18,7 +18,7 @@
*
* This file will be included to run the login.include.php and check untrusted data before executing the script.
*
- * @version 0.2
+ * @version 0.3
*
*/
@@ -34,23 +34,27 @@
// -> check PHP vars
$_SERVER['PHP_SELF'] = XssFilter::path($_SERVER['PHP_SELF']);
-
// ->> CHECK the GET and POST variables
-// -> check CATEGORY
if(isset($_GET['category'])) $_GET['category'] = XssFilter::int($_GET['category'],0);
if(isset($_POST['category'])) $_POST['category'] = XssFilter::int($_POST['category'],0);
-// -> check PAGE
if(isset($_GET['page']) && $_GET['page'] !== 'new') $_GET['page'] = XssFilter::int($_GET['page'],0);
if(isset($_POST['page']) && $_POST['page'] !== 'new') $_POST['page'] = XssFilter::int($_POST['page'],0);
-
-// ->> CHECK INPUTS
-// ****************
-// -> check SITE
if(isset($_GET['site'])) $_GET['site'] = XssFilter::stringStrict($_GET['site']);
/**
* Then includes the login
*/
require_once(dirname(__FILE__).'/login.include.php');
+
+// ->> CHECK PERMISSIONS
+
+// pages
+if(!empty($_GET['page']) && !GeneralFunctions::hasPermission('editablePages',$_GET['page']))
+ unset($_GET);
+
+// websiteSetup
+if($_GET['site'] == 'websiteSetup' && !GeneralFunctions::hasPermission('websiteSettings'))
+ unset($_GET['site']);
+
?>
View
70 library/javascripts/content.js
@@ -203,30 +203,6 @@ function removeChecked(selector) {
}
// -------------------------------------------------
-// auto resize of the THUMBNAIL-PREVIEW
-function autoResizeThumbnailPreview() {
- var thumbnail = $('thumbnailPreviewImage');
- if(thumbnail !== null) {
-
- // set tween
- thumbnail.set('tween',{duration: 500, transition: Fx.Transitions.Pow.easeOut});
-
- //mouseover
- thumbnail.addEvent('mouseenter',function() {
- if(thumbnail.getProperty('data-width') >= 200)
- thumbnail.tween('width',thumbnail.getProperty('data-width'));
- });
-
- // mouseout
- thumbnail.addEvent('mouseleave',function() {
- if(thumbnail.getProperty('data-width') >= 200)
- thumbnail.tween('width',200);
- });
-
- }
-}
-
-// -------------------------------------------------
// BLOCK SLIDE IN/OUT
function blockSlider(givenId) {
@@ -320,15 +296,12 @@ function inBlockSlider() {
$$('.inBlockSlider').each(function(inBlockSlider) {
- var inBlockSliderLink;
- $$('.inBlockSliderLink').each(function(sliderLink) {
- if(sliderLink.getProperty('data-inBlockSlider') == inBlockSlider.getProperty('data-inBlockSlider')) {
- inBlockSliderLink = sliderLink;
- return;
- }
+ var inBlockSliderLinks = [];
+ $$('.inBlockSliderLink[data-inBlockSlider="'+inBlockSlider.getProperty('data-inBlockSlider')+'"]').each(function(sliderLink) {
+ inBlockSliderLinks.push(sliderLink);
});
- if(typeOf(inBlockSliderLink) == 'null')
+ if(typeOf(inBlockSliderLinks[0]) === 'null')
return;
var slide = inBlockSlider.get('slide');
@@ -349,16 +322,18 @@ function inBlockSlider() {
}
// sets the SLIDE effect to the SLIDE links
- inBlockSliderLink.addEvent('click', function(e) {
- if(e.target.match('a')) e.stop();
+ inBlockSliderLinks.each(function(inBlockSliderLink){
+ inBlockSliderLink.addEvent('click', function(e) {
+ if(e.target.match('a')) e.stop();
- if(inBlockSlider.hasClass('hidden'))
- wrapper.fade(1);
- else
- wrapper.fade(0);
+ if(inBlockSlider.hasClass('hidden'))
+ wrapper.fade(1);
+ else
+ wrapper.fade(0);
- inBlockSlider.toggleClass('hidden');
- slide.toggle();
+ inBlockSlider.toggleClass('hidden');
+ slide.toggle();
+ });
});
});
}
@@ -460,7 +435,7 @@ function sidebarMenu() {
/* ---------------------------------------------------------------------------------- */
// SIDEBAR AJAX REQUEST
// send a HTML request to load the new Sidebar content
-function requestLeftSidebar(site,page,category) {
+function loadSideBarMenu(site,page,category) {
// vars
if(!page) page = 0;
@@ -474,8 +449,8 @@ function requestLeftSidebar(site,page,category) {
var requestCategory = new Request.HTML({
url:'library/leftSidebar.loader.php',
method: 'get',
- data: 'site=' + site + '&category=' + category + '&page=' + page,
- update: leftSideBar,
+ data: 'site=' + site + '&category=' + category + '&page=' + page + '&loadSideBarMenu=true',
+ update: $('sidebarSelection'),
//-----------------------------------------------------------------------------
onRequest: function() { //-----------------------------------------------------
@@ -505,17 +480,12 @@ function requestLeftSidebar(site,page,category) {
LeavingWithoutSavingWarning();
sidebarMenu();
setToolTips();
-
- // adds static scroller
- $$('.staticScroller').each(function(element){
- new StaticScroller(element,{offset:1});
- });
},
//-----------------------------------------------------------------------------
//Our request will most likely succeed, but just in case, we'll add an
//onFailure method which will let the user know what happened.
onFailure: function() { //-----------------------------------------------------
- leftSideBar.set('html','<div class="alert alert-error">Couldn\'t load the sidebar?</div>');
+ sideBarMenus.set('html','<div class="alert alert-error">Couldn\'t load the sidebar?</div>');
}
});
@@ -538,7 +508,7 @@ function LeavingWithoutSavingWarning() {
if((onclick === null ||
(onclick !== null &&
onclick.toString().substr(0,13) !== 'openWindowBox' &&
- onclick.toString().substr(0,18) !== 'requestLeftSidebar')) &&
+ onclick.toString().substr(0,18) !== 'loadSideBarMenu')) &&
href !== null &&
href.toString().indexOf('#') == -1) {
@@ -558,8 +528,6 @@ function LeavingWithoutSavingWarning() {
// *---------------------------------------------------------------------------------------------------*
window.addEvent('load', function() {
- autoResizeThumbnailPreview();
-
// SCROLL to ANCHORS after loading the pages (should fix problems with slided in blocks)
var anchorId = window.location.hash.substring(1);
if($(anchorId) !== null)
View
12 library/javascripts/windowBox.js
@@ -239,22 +239,25 @@ function stopUploadAnimation() {
}
//--------------------------------------------------
// called on the SUCCESFULL end of the upload
-function finishThumbnailUpload(frameHeight,newImage,ImageWidth) {
+function finishThumbnailUpload(frameHeight,newImage) {
// delete the previous preview image
if($('windowBoxThumbnailPreview') !== null)
$('windowBoxThumbnailPreview').destroy();
// shows the iframe content
- if($('uploadTargetFrame').tween('height',frameHeight))
+ $('uploadTargetFrame').tween('height',frameHeight);
// show the ok button
$('pageThumbnailOkButton').setStyle('display','inline-block');
- refreshThumbnailImage(newImage,ImageWidth);
+ refreshThumbnailImage(newImage);
// hides the from and the thumbInfo
$('uploadPageThumbnailForm').setStyle('display','none');
+
+ // automatically close
+ // (function(){closeWindowBox()}).delay(1000);
}
// *---------------------------------------------------------------------------------------------------*
@@ -303,9 +306,6 @@ window.addEvent('domready', function() {
// sets the realtime
setThumbScale('windowBox_thumbWidth','windowBox_thumbWidthScale','windowBox_thumbHeight','windowBox_thumbHeightScale');
-
- /* set autoresize to THUMBNAIL PREVIEW */
- //autoResizeThumbnailPreview();
}
});
});
View
13 library/languages/de.backend.php
@@ -79,6 +79,8 @@
$langFile['HEADER_BUTTON_GOTOWEBSITE_FRONTENDEDITING'] = 'Frontend-Bearbeitung::Klick hier um die Seiten direkt in der Webseite zu bearbeiten.';
+$langFile['BUTTON_MORE'] = 'mehr';
+
// PERMISSIONS
$langFile['PERMISSIONS_TEXT_DONTHAVEPERMISSION'] = 'Du bist nicht berechtigt dies zu verändern.';
@@ -137,10 +139,8 @@
$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'Erster Besuch';
$langFile['STATISTICS_TEXT_LASTVISIT'] = 'Letzter Besuch';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Es hat noch niemand diese Seite besucht.';
-$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = 'Suchworte die von
-<a href ="http://www.google.de">Google</a>,
-<a href ="http://www.yahoo.de">Yahoo</a> oder
-<a href ="http://www.bing.com">Bing (MSN)</a> auf diese Seite geführt haben';
+$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::Die von
+Google, Yahoo oder Bing (MSN) auf diese Seite geführt haben">Suchworte</span>';
$langFile['STATISTICS_TEXT_HOUR_SINGULAR'] = 'Stunde';
$langFile['STATISTICS_TEXT_HOUR_PLURAL'] = 'Stunden';
@@ -343,8 +343,7 @@
$langFile['SORTABLEPAGELIST_functions_editPage'] = 'Seite bearbeiten';
-$langFile['SORTABLEPAGELIST_changeStatus_linkPage'] = 'Hier klicken um den Status für Seite zu ändern.';
-$langFile['SORTABLEPAGELIST_changeStatus_linkCategory'] = 'Hier klicken um den Status für die Kategorie zu ändern.';
+$langFile['SORTABLEPAGELIST_TIP_CHANGESTATUS'] = 'Hier klicken um den Status zu ändern.';
$langFile['SORTABLEPAGELIST_TOOLTIP_LANGUAGEMISSING'] = 'Fehlende Sprachen';
@@ -684,7 +683,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';
+$langFile['EDITOR_pageinfo_lastsavedate'] = 'zuletzt bearbeitet am';
$langFile['EDITOR_pageinfo_lastsaveauthor'] = 'von';
$langFile['EDITOR_pageinfo_linktothispage'] = 'Link zu dieser Seite';
$langFile['EDITOR_pageinfo_id'] = 'Seiten ID';
View
13 library/languages/en.backend.php
@@ -79,6 +79,8 @@
$langFile['HEADER_BUTTON_GOTOWEBSITE_FRONTENDEDITING'] = 'Frontend Editing::Click here to edit the pages directly in your website.';
+$langFile['BUTTON_MORE'] = 'more';
+
// PERMISSIONS
$langFile['PERMISSIONS_TEXT_DONTHAVEPERMISSION'] = 'You are not authorized to change this.';
@@ -137,10 +139,8 @@
$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'first visit';
$langFile['STATISTICS_TEXT_LASTVISIT'] = 'last visit';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Yet nobody visit this website.';
-$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = 'Searchwords which led from
-<a href ="http://www.google.de">Google</a>,
-<a href ="http://www.yahoo.de">Yahoo</a> or
-<a href ="http://www.bing.com">Bing (MSN)</a> to this website.';
+$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::Which led from
+Google, Yahoo or Bing (MSN) to this website.">Searchwords</span>';
$langFile['STATISTICS_TEXT_HOUR_SINGULAR'] = 'hour';
$langFile['STATISTICS_TEXT_HOUR_PLURAL'] = 'hours';
@@ -344,8 +344,7 @@
$langFile['SORTABLEPAGELIST_functions_editPage'] = 'Edit page';
-$langFile['SORTABLEPAGELIST_changeStatus_linkPage'] = 'Click here to change the status of the page.';
-$langFile['SORTABLEPAGELIST_changeStatus_linkCategory'] = 'Click here to change the status of the category.';
+$langFile['SORTABLEPAGELIST_TIP_CHANGESTATUS'] = 'Click here to change the status.';
$langFile['SORTABLEPAGELIST_TOOLTIP_LANGUAGEMISSING'] = 'Missing languages';
@@ -685,7 +684,7 @@
// ---------- page info
$langFile['EDITOR_TITLE_CREATEPAGE'] = 'Create new page';
$langFile['EDITOR_TITLE_ADDLANGUAGE'] = 'Add language &quot;%s&quot; to the page';
-$langFile['EDITOR_pageinfo_lastsavedate'] = 'last edit';
+$langFile['EDITOR_pageinfo_lastsavedate'] = 'last edit on';
$langFile['EDITOR_pageinfo_lastsaveauthor'] = 'by';
$langFile['EDITOR_pageinfo_linktothispage'] = 'Link to this page';
$langFile['EDITOR_pageinfo_id'] = 'Page ID';
View
13 library/languages/fr.backend.php
@@ -79,6 +79,8 @@
$langFile['HEADER_BUTTON_GOTOWEBSITE_FRONTENDEDITING'] = 'Feindura::S&#145;il vous plaît cliquez ici pour éditer les pages directement sur votre site web.';
+$langFile['BUTTON_MORE'] = 'plus';
+
// PERMISSIONS
$langFile['PERMISSIONS_TEXT_DONTHAVEPERMISSION'] = 'Vous n&#145;êtes pas autorisé à changer cette situation.';
@@ -132,10 +134,8 @@
$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'première visite';
$langFile['STATISTICS_TEXT_LASTVISIT'] = 'dernière visite';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Personne a visité ce site web.';
-$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = 'Mot de recherche qui ont mèné
-<a href ="http://www.google.de">Google</a>,
-<a href ="http://www.yahoo.de">Yahoo</a> ou
-<a href ="http://www.bing.com">Bing (MSN)</a> sur 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>';
$langFile['STATISTICS_TEXT_HOUR_SINGULAR'] = 'heur';
$langFile['STATISTICS_TEXT_HOUR_PLURAL'] = 'heures';
@@ -325,8 +325,7 @@
$langFile['SORTABLEPAGELIST_TIP_SORTBYPAGEDATE'] = 'trié par ordre chronologique';
$langFile['SORTABLEPAGELIST_functions_editPage'] = 'rédiger la page';
-$langFile['SORTABLEPAGELIST_changeStatus_linkPage'] = 'Cliquer ici pour changer le status du site web.';
-$langFile['SORTABLEPAGELIST_changeStatus_linkCategory'] = 'Cliquer ici pour changer le status de la catégorie.';
+$langFile['SORTABLEPAGELIST_TIP_CHANGESTATUS'] = 'Cliquer ici pour changer le status.';
$langFile['SORTABLEPAGELIST_TOOLTIP_LANGUAGEMISSING'] = 'langues disparues';
@@ -651,7 +650,7 @@
// ---------- page info
$langFile['EDITOR_TITLE_CREATEPAGE'] = 'créer nouvelle page';
$langFile['EDITOR_TITLE_ADDLANGUAGE'] = 'Ajouter la langue &quot;%s&quot; à la page';
-$langFile['EDITOR_pageinfo_lastsavedate'] = 'dernièrement traité';
+$langFile['EDITOR_pageinfo_lastsavedate'] = 'Dernière modification du';
$langFile['EDITOR_pageinfo_lastsaveauthor'] = 'de';
$langFile['EDITOR_pageinfo_linktothispage'] = 'lien mènant sur le site web';
$langFile['EDITOR_pageinfo_id'] = 'ID de la page';
View
15 library/languages/it.backend.php
@@ -79,6 +79,8 @@
$langFile['HEADER_BUTTON_GOTOWEBSITE_FRONTENDEDITING'] = 'Editing Frontale::Clicca qui per modificare le pagine direttamente nel tuo sito web.';
+$langFile['BUTTON_MORE'] = 'altro';
+
// PERMISSIONS
$langFile['PERMISSIONS_TEXT_DONTHAVEPERMISSION'] = 'Non sei autorizzato a cambiare questa situazione.';
@@ -126,7 +128,7 @@
$langFile['STATISTICS_TEXT_SEARCHWORD_PART2'] = 'volte a questo sito';
$langFile['STATISTICS_TOOLTIP_SEARCHWORD'] = 'Clicca qui per la ricerca di questa parola nelle pagine.';
-$langFile['STATISTICS_TEXT_VISITORCOUNT'] = 'visitatori totali';
+$langFile['STATISTICS_TEXT_VISITORCOUNT'] = 'visitatori';
$langFile['STATISTICS_TEXT_CURRENTVISITORS'] = 'visitatori correnti';
$langFile['STATISTICS_TEXT_LASTACTIVITY'] = 'ultima attività';
@@ -137,10 +139,8 @@
$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'prima visita';
$langFile['STATISTICS_TEXT_LASTVISIT'] = 'ultima visita';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Nessuno mai ancora ha visito questo sito.';
-$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = 'Parole di ricerca che hanno portato da
-<a href ="http://www.google.de">Google</a>,
-<a href ="http://www.yahoo.de">Yahoo</a> or
-<a href ="http://www.bing.com">Bing (MSN)</a> a 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>';
$langFile['STATISTICS_TEXT_HOUR_SINGULAR'] = 'ora';
$langFile['STATISTICS_TEXT_HOUR_PLURAL'] = 'ore';
@@ -346,8 +346,7 @@
$langFile['SORTABLEPAGELIST_functions_editPage'] = 'Modifica Pagina';
-$langFile['SORTABLEPAGELIST_changeStatus_linkPage'] = 'Clicca qui per cambiare lo stato della pagina.';
-$langFile['SORTABLEPAGELIST_changeStatus_linkCategory'] = 'Clicca qui per cambiare lo stato della categoria.';
+$langFile['SORTABLEPAGELIST_TIP_CHANGESTATUS'] = 'Clicca qui per cambiare lo stato.';
$langFile['SORTABLEPAGELIST_TOOLTIP_LANGUAGEMISSING'] = 'Lingue mancanti';
@@ -685,7 +684,7 @@
// ---------- page info
$langFile['EDITOR_TITLE_CREATEPAGE'] = 'Crea una nuova pagina';
$langFile['EDITOR_TITLE_ADDLANGUAGE'] = 'Aggiungi lingua &quot;%s&quot; alla pagina';
-$langFile['EDITOR_pageinfo_lastsavedate'] = 'ultima modifica';
+$langFile['EDITOR_pageinfo_lastsavedate'] = 'Ultima modifica al';
$langFile['EDITOR_pageinfo_lastsaveauthor'] = 'di';
$langFile['EDITOR_pageinfo_linktothispage'] = 'Collegamento a questa pagina';
$langFile['EDITOR_pageinfo_id'] = 'ID Pagina';
View
21 library/languages/ru.backend.php
@@ -81,6 +81,8 @@
$langFile['HEADER_BUTTON_GOTOWEBSITE_FRONTENDEDITING'] = 'Редактировать на сайте::Нажмите что бы редактировать страницы на сайте.';
+$langFile['BUTTON_MORE'] = 'гораздо';
+
// PERMISSIONS
$langFile['PERMISSIONS_TEXT_DONTHAVEPERMISSION'] = 'Вы не авторизованы, чтобы изменить это.';
@@ -128,9 +130,9 @@
$langFile['STATISTICS_TEXT_SEARCHWORD_PART2'] = 'раз на сайт';
$langFile['STATISTICS_TOOLTIP_SEARCHWORD'] = 'Нажмите для поиска слова на странице.';
-$langFile['STATISTICS_TEXT_VISITORCOUNT'] = 'посетителей';
-$langFile['STATISTICS_TEXT_CURRENTVISITORS'] = 'текущие посетители';
-$langFile['STATISTICS_TEXT_LASTACTIVITY'] = 'последняя активность';
+$langFile['STATISTICS_TEXT_VISITORCOUNT'] = 'Посетителей';
+$langFile['STATISTICS_TEXT_CURRENTVISITORS'] = 'Текущие посетители';
+$langFile['STATISTICS_TEXT_LASTACTIVITY'] = 'Последняя активность';
$langFile['STATISTICS_TITLE_PAGESTATISTICS'] = 'Статистика по страницам';
@@ -139,10 +141,8 @@
$langFile['STATISTICS_TEXT_FIRSTVISIT'] = 'первое посещение';
$langFile['STATISTICS_TEXT_LASTVISIT'] = 'последнее посещение';
$langFile['STATISTICS_TEXT_NOVISIT'] = 'Еще никто не посещал сайт.';
-$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = 'Ключевые слова по которым приходят из
-<a href ="http://www.google.de">Google</a>,
-<a href ="http://www.yahoo.de">Yahoo</a> или
-<a href ="http://www.bing.com">Bing (MSN)</a> на сайт.';
+$langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION'] = '<span class="toolTipTop" title="::По которым приходят из
+Google, Yahoo или Bing (MSN) на сайт.">Ключевые слова</span>';
$langFile['STATISTICS_TEXT_HOUR_SINGULAR'] = 'час';
$langFile['STATISTICS_TEXT_HOUR_PLURAL'] = 'часов';
@@ -349,8 +349,7 @@
$langFile['SORTABLEPAGELIST_functions_editPage'] = 'Редактировать';
-$langFile['SORTABLEPAGELIST_changeStatus_linkPage'] = 'Нажмите что бы изменить статус страницы.';
-$langFile['SORTABLEPAGELIST_changeStatus_linkCategory'] = 'Нажмите что бы изменить статус категории';
+$langFile['SORTABLEPAGELIST_TIP_CHANGESTATUS'] = 'Нажмите что бы изменить.';
$langFile['SORTABLEPAGELIST_TOOLTIP_LANGUAGEMISSING'] = 'Отсутствует языках';
@@ -690,8 +689,8 @@
// ---------- page info
$langFile['EDITOR_TITLE_CREATEPAGE'] = 'Создание новой страницы';
$langFile['EDITOR_TITLE_ADDLANGUAGE'] = 'Добавить язык &quot;%s&quot; на странице';
-$langFile['EDITOR_pageinfo_lastsavedate'] = 'последняя редакция';
-$langFile['EDITOR_pageinfo_lastsaveauthor'] = '-';
+$langFile['EDITOR_pageinfo_lastsavedate'] = 'В последний раз редактировали';
+$langFile['EDITOR_pageinfo_lastsaveauthor'] = 'с';
$langFile['EDITOR_pageinfo_linktothispage'] = 'Ссылка на страницу';
$langFile['EDITOR_pageinfo_id'] = 'ID страницы';
$langFile['EDITOR_pageinfo_id_tip'] = 'С этим ID страница хранится на сервере.';
View
9 library/leftSidebar.loader.php
@@ -32,7 +32,8 @@
// or if $_GET['site'] == 'pages'
if((!empty($_GET['page']) && empty($_GET['site']))) { // || $_GET['site'] == 'pages'
- echo '<div id="sidebarSelection" class="staticScroller">';
+ if(!$_GET['loadSideBarMenu'])
+ echo '<div id="sidebarSelection" class="staticScroller">';
// ---- show QUICKMENU for the NONE-CATEGORY PAGES
// slide the categories menu IN, when a category is open
@@ -116,7 +117,7 @@
$categorySelected = ' class="active"';
else
$categorySelected = '';
- echo '<li><a href="?site=pages&amp;category='.$category['id'].'" tabindex="'.$tabIndex.'" onclick="requestLeftSidebar(\''.$_GET['site'].'\',\''.$_GET['page'].'\',\''.$category['id'].'\');return false;"'.$categorySelected.'><span'.$categoryId.'>'.GeneralFunctions::getLocalized($category,'name').'</span></a></li>';
+ echo '<li><a href="?site=pages&amp;category='.$category['id'].'" tabindex="'.$tabIndex.'" onclick="loadSideBarMenu(\''.$_GET['site'].'\',\''.$_GET['page'].'\',\''.$category['id'].'\');return false;"'.$categorySelected.'><span'.$categoryId.'>'.GeneralFunctions::getLocalized($category,'name').'</span></a></li>';
$tabIndex++;
}
echo '</menu>
@@ -165,7 +166,9 @@
</div>';
}
- echo '</div>';
+ // sidebarSelection end
+ if(!$_GET['loadSideBarMenu'])
+ echo '</div>';
// -----------------------------------------------------------------------------------
// SWITCH SITE
} else {
View
355 library/rightSidebar.loader.php
@@ -14,49 +14,274 @@
You should have received a copy of the GNU General Public License along with this program;
if not,see <http://www.gnu.org/licenses/>.
*/
-// sidebar.loader.php version 0.7
+// sidebar.loader.php version 0.8
-// SWITCH the &_GET['site'] var
-switch($_GET['site']) {
+// PAGES
+if(!empty($_GET['page']) && is_numeric($_GET['page'])) {
- // ***** dashboard sideBar -------------------------------------------------- *********
- case 'dashboard':
- break;
+ if(is_numeric($pageContent['id'])) {
+
+ // vars
+ $pageStatistics = StatisticFunctions::readPageStatistics($pageContent['id']);
+
+ $firstVisitDate = GeneralFunctions::formatDate($pageStatistics['firstVisit']);
+ $firstVisitTime = formatTime($pageStatistics['firstVisit']);
+ $lastVisitDate = GeneralFunctions::formatDate($pageStatistics['lastVisit']);
+ $lastVisitTime = formatTime($pageStatistics['lastVisit']);
+
+ $visitTimes_max = unserialize($pageStatistics['visitTimeMax']);
+ $visitTimes_min = unserialize($pageStatistics['visitTimeMin']);
+
+ if($pageStatistics['firstVisit']) {
+ ?>
+
+ <div class="box">
+ <h1><img src="library/images/icons/statisticIcon_small.png" alt="icon" width="30" height="27"><?php echo $langFile['EDITOR_pagestatistics_h1']; ?></h1>
+ <!-- VISITOR COUNT -->
+ <div class="row">
+ <div class="span1">
+ <strong><?php echo $langFile['STATISTICS_TEXT_VISITORCOUNT']; ?></strong>
+ </div>
+ <div class="span1">
+ <?php echo formatHighNumber($pageStatistics['visitorCount']); ?>
+ <a href="#" class="down inBlockSliderLink toolTipRight" style="position:absolute;right: 10px;" data-inBlockSlider="moreStatistics" title="::<?php echo $langFile['BUTTON_MORE']; ?>">&nbsp;</a>
+ </div>
+ </div>
+
+ <div class="statistics inBlockSlider hidden" data-inBlockSlider="moreStatistics">
+ <div class="spacer"></div>
+ <!-- FIRST VISIT -->
+ <div class="row">
+ <div class="span1">
+ <strong><?php echo $langFile['STATISTICS_TEXT_FIRSTVISIT']; ?></strong>
+ </div>
+ <div class="span1">
+ <?php echo '<span class="toolTipRight" title="'.$firstVisitTime.'::">'.$firstVisitDate.'</span>'; ?>
+ </div>
+ </div>
+ <!-- LAST VISIT -->
+ <div class="row">
+ <div class="span1">
+ <strong><?php echo $langFile['STATISTICS_TEXT_LASTVISIT']; ?></strong>
+ </div>
+ <div class="span1">
+ <?php echo '<span class="toolTipRight" title="'.$lastVisitTime.'::">'.$lastVisitDate.'</span>'; ?>
+ </div>
+ </div>
+
+ <div class="spacer"></div>
+
+ <!-- VISIT TIME MAX -->
+ <div class="row">
+ <div class="span1">
+ <strong><?php echo $langFile['STATISTICS_TEXT_VISITTIME_MAX']; ?></strong>
+ </div>
+ <div class="span1">
+ <?php
+ $showTimeHead = true;
+ if(is_array($visitTimes_max)) {
+ foreach($visitTimes_max as $visitTime_max) {
+ if($visitTimeFormated = showVisitTime($visitTime_max)) {
+ if($showTimeHead) {
+ echo '<span class="toolTipRight" title="::';
+ $visitTimeHead = $visitTimeFormated;
+ $showTimeHead = false;
+ } else {
+
+ echo str_replace(array('<','>'),array('[',']'),$visitTimeFormated).'[br]';
+ }
+ }
+ }
+ echo '">'.$visitTimeHead.'</span>';
+ }
+ ?>
+ </div>
+ </div>
+ <!-- VISIT TIME MIN -->
+ <div class="row">
+ <div class="span1">
+ <strong><?php echo $langFile['STATISTICS_TEXT_VISITTIME_MIN']; ?></strong>
+ </div>
+ <div class="span1">
+ <?php
+ $showTimeHead = true;
+ if(is_array($visitTimes_min)) {
+ foreach($visitTimes_min as $visitTime_min) {
+ if($visitTimeFormated = showVisitTime($visitTime_min)) {
+ if($showTimeHead) {
+ echo '<span class="toolTipRight" title="::';
+ $visitTimeHead = $visitTimeFormated;
+ $showTimeHead = false;
+ } else {
+
+ echo str_replace(array('<','>'),array('[',']'),$visitTimeFormated).'[br]';
+ }
+ }
+ }
+ echo '">'.$visitTimeHead.'</span>';
+ }
+ ?>
+ </div>
+ </div>
+ </div>
+
+ <?php
+ $searchWords = createTagCloud($pageStatistics['searchWords'],6,9);
+
+ if($searchWords) {
+ ?>
+ <div class="spacer"></div>
+
+ <!-- SEARCHWORDS -->
+ <h2 class="center"><?php echo $langFile['STATISTICS_TEXT_SEARCHWORD_DESCRIPTION']; ?></h2>
+ <?php
+ echo '<div class="tagCloud">';
+ echo createTagCloud($pageStatistics['searchWords'],6,9);
+ echo '</div>';
+
+ }
+ ?>
+ </div>
+
+ <?php
+ }
+ //$langFile['STATISTICS_TEXT_NOVISIT']
+ unset($searchWords,$pageStatistics,$firstVisitDate,$firstVisitTime,$lastVisitDate,$lastVisitTime,$visitTimes_max,$visitTimes_min,$showTimeHead,$visitTimeFormated);
+
+
+ // THUMBNAIL
+ if($categoryConfig[$pageContent['category']]['thumbnails'] || !empty($pageContent['thumbnail'])) {
+ ?>
+ <div class="box center">
+ <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'] : '#';
+
+ // -> show THUMBNAIL if the page has one
+ $displayThumbnailContainer = ' display:none;';
+ if(!$newPage && $categoryConfig[$pageContent['category']]['thumbnails'] && !empty($pageContent['thumbnail'])) {
+ $displayThumbnailContainer = '';
+ }
+
+ // generates a random number to put on the end of the image, to prevent caching
+ // $randomImage = '?'.md5(uniqid(rand(),1));
+
+ // thumbnailPreviewContainer
+ echo '<div id="thumbnailPreviewContainer" style="position:relative;display:inline-block;'.$displayThumbnailContainer.'">';
+ // see if the thumbnails are activated, add upload/delete buttons
+ if($categoryConfig[$pageContent['category']]['thumbnails']) {
+ echo '<a 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_TOOLTIP_THUMBNAIL_DELETE'].'::"" class="deleteButton toolTipLeft"></a>';
+ echo '<a 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;" class="image">';
+ echo '<img src="'.$thumbnailPath.'" id="thumbnailPreviewImage" class="thumbnail" alt="thumbnail">';
+ echo '</a>';
+ // if not only show the thumbnailPreviewImage
+ } else
+ echo '<img src="'.$thumbnailPath.'" id="thumbnailPreviewImage" class="thumbnail" alt="thumbnail">';
- // ***** pages sideBar -------------------------------------------------- *********
- case 'pages':
- echo '<div id="messageBox_input" class="box">';
- echo '<img src="library/images/icons/hintIcon.png" class="hintIcon" alt="icon" style="width: 65px; height: 65px">'.$langFile['SORTABLEPAGELIST_info'];
- // -> the javascript request of the sortable gets its error messages from this input
- echo '<input type="hidden" id="sortablePageList_status" value="'.$langFile['SORTABLEPAGELIST_save'].'|'.$langFile['SORTABLEPAGELIST_categoryEmpty'].'">';
- echo '</div>';
- break;
-
- // ***** statisticSetup sideBar -------------------------------------------- *********
- case 'statisticSetup':
- if($deletedStatistics) {
- echo '<div class="box">';
- echo '<img src="library/images/icons/hintIcon.png" class="hintIcon" width="65" height="65">';
- echo $deletedStatistics;
echo '</div>';
+
+ // -> show the thumbnail upload button if there is no thumbnail yet
+ $displayThumbnailUploadButton = (!$newPage && $categoryConfig[$pageContent['category']]['thumbnails'] && empty($pageContent['thumbnail']))
+ ? '' : ' style="display:none;"';
+
+ // thumbnailUploadButtonInPreviewArea
+ echo '<a href="?site=uploadPageThumbnail&amp;category='.$_GET['category'].'&amp;page='.$_GET['page'].'" id="thumbnailUploadButtonInPreviewArea" 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_TOOLTIP_THUMBNAIL_UPLOAD'].'::" class="uploadPageThumbnail toolTipBottom"'.$displayThumbnailUploadButton.'></a>';
+ ?>
+ </div>
+ <?php
}
- break;
-
- // ***** websiteSetup sideBar -------------------------------------------- *********
- case 'websiteSetup':
- if(is_array($websiteConfig['localized'])) {
- $websiteConfigLanguages = array_keys($websiteConfig['localized']);
- if(is_array($websiteConfigLanguages) && is_array($websiteConfig['multiLanguageWebsite']['languages']))
- $websiteConfigLanguagesDiff = array_diff($websiteConfig['multiLanguageWebsite']['languages'],$websiteConfigLanguages);
- if($websiteConfig['multiLanguageWebsite']['active'] && !empty($websiteConfigLanguagesDiff)) {
+ }
+
+// SITES
+} else {
+
+ // SWITCH the &_GET['site'] var
+ switch($_GET['site']) {
+
+ // ***** dashboard sideBar -------------------------------------------------- *********
+ case 'dashboard':
+ break;
+
+ // ***** pages sideBar -------------------------------------------------- *********
+ case 'pages':
+ echo '<div id="messageBox_input" class="box">';
+ echo '<img src="library/images/icons/hintIcon.png" class="hintIcon" alt="icon" style="width: 65px; height: 65px">'.$langFile['SORTABLEPAGELIST_info'];
+ // -> the javascript request of the sortable gets its error messages from this input
+ echo '<input type="hidden" id="sortablePageList_status" value="'.$langFile['SORTABLEPAGELIST_save'].'|'.$langFile['SORTABLEPAGELIST_categoryEmpty'].'">';
+ echo '</div>';
+ break;
+
+ // ***** statisticSetup sideBar -------------------------------------------- *********
+ case 'statisticSetup':
+ if($deletedStatistics) {
+ echo '<div class="box">';
+ echo '<img src="library/images/icons/hintIcon.png" class="hintIcon" width="65" height="65">';
+ echo $deletedStatistics;
+ echo '</div>';
+ }
+ break;
+
+ // ***** websiteSetup sideBar -------------------------------------------- *********
+ case 'websiteSetup':
+ if(is_array($websiteConfig['localized'])) {
+ $websiteConfigLanguages = array_keys($websiteConfig['localized']);
+ if(is_array($websiteConfigLanguages) && is_array($websiteConfig['multiLanguageWebsite']['languages']))
+ $websiteConfigLanguagesDiff = array_diff($websiteConfig['multiLanguageWebsite']['languages'],$websiteConfigLanguages);
+ if($websiteConfig['multiLanguageWebsite']['active'] && !empty($websiteConfigLanguagesDiff)) {
+ echo '<div class="box">';
+ echo '<img src="library/images/icons/missingLanguages.png" class="hintIcon" width="50" height="50">';
+ echo '<h1>'.$langFile['SORTABLEPAGELIST_TOOLTIP_LANGUAGEMISSING'].'</h1>';
+ echo '<ul class="flags">';
+ foreach ($websiteConfig['multiLanguageWebsite']['languages'] as $langCode) {
+ if(!isset($websiteConfig['localized'][$langCode])) {
+ echo '<li><img src="'.GeneralFunctions::getFlagHref($langCode).'" class="flag"> <a href="'.GeneralFunctions::addParameterToUrl('websiteLanguage',$langCode).'" class="link gray">'.$languageNames[$langCode].'</a></li>';
+ }
+ }
+ echo '</ul>';
+ echo '</div>';
+ } else {
+ $currentVisitorFullDetail = false;
+ $currentVisitors = include('library/includes/currentVisitors.include.php');
+ if($currentVisitors) {
+ echo '<div class="box currentVisitorsSideBar">';
+ echo $currentVisitors;
+ echo '</div>';
+ }
+ }
+ }
+ unset($websiteConfigLanguages,$websiteConfigLanguagesDiff);
+ break;
+
+ // ***** pageSetup sideBar -------------------------------------------- *********
+ case 'pageSetup':
+ $categoryHasMissingLanguages = false;
+ if(is_array($websiteConfig['multiLanguageWebsite']['languages'])) {
+ foreach ($categoryConfig as $category) {
+ if($category['id'] == 0)
+ continue;
+ $arrayDifferences = array_diff($websiteConfig['multiLanguageWebsite']['languages'],array_keys($category['localized']));
+ if(!empty($arrayDifferences)) {
+ $categoryHasMissingLanguages = true;
+ break;
+ }
+ }
+ }
+ if($categoryHasMissingLanguages) {
echo '<div class="box">';
echo '<img src="library/images/icons/missingLanguages.png" class="hintIcon" width="50" height="50">';
- echo '<h1>'.$langFile['SORTABLEPAGELIST_TOOLTIP_LANGUAGEMISSING'].'</h1>';
+ echo '<h1>'.$langFile['WARNING_TITLE_UNTITLEDCATEGORIES'].'</h1>';
echo '<ul class="flags">';
foreach ($websiteConfig['multiLanguageWebsite']['languages'] as $langCode) {
- if(!isset($websiteConfig['localized'][$langCode])) {
- echo '<li><img src="'.GeneralFunctions::getFlagHref($langCode).'" class="flag"> <a href="'.GeneralFunctions::addParameterToUrl('websiteLanguage',$langCode).'" class="link gray">'.$languageNames[$langCode].'</a></li>';
+ foreach ($categoryConfig as $category) {
+ if($category['id'] == 0)
+ continue;
+ if(!isset($category['localized'][$langCode])) {
+ $categoryName = GeneralFunctions::getLocalized($category,'name');
+ $categoryName = (!empty($categoryName)) ? ' &rArr; '.$categoryName : '';
+ echo '<li><img src="'.GeneralFunctions::getFlagHref($langCode).'" class="flag"> '.$languageNames[$langCode].'<a href="'.GeneralFunctions::addParameterToUrl('websiteLanguage',$langCode).'" class="link gray">'.$categoryName.'</a></li>';
+ }
}
}
echo '</ul>';
@@ -65,69 +290,23 @@
$currentVisitorFullDetail = false;
$currentVisitors = include('library/includes/currentVisitors.include.php');
if($currentVisitors) {
- echo '<div class="box currentVisitorsSideBar">';
+ echo '<div class="box">';
echo $currentVisitors;
echo '</div>';
}
}
- }
- unset($websiteConfigLanguages,$websiteConfigLanguagesDiff);
- break;
-
- // ***** pageSetup sideBar -------------------------------------------- *********
- case 'pageSetup':
- $categoryHasMissingLanguages = false;
- if(is_array($websiteConfig['multiLanguageWebsite']['languages'])) {
- foreach ($categoryConfig as $category) {
- if($category['id'] == 0)
- continue;
- $arrayDifferences = array_diff($websiteConfig['multiLanguageWebsite']['languages'],array_keys($category['localized']));
- if(!empty($arrayDifferences)) {
- $categoryHasMissingLanguages = true;
- break;
- }
- }
- }
- if($categoryHasMissingLanguages) {
- echo '<div class="box">';
- echo '<img src="library/images/icons/missingLanguages.png" class="hintIcon" width="50" height="50">';
- echo '<h1>'.$langFile['WARNING_TITLE_UNTITLEDCATEGORIES'].'</h1>';
- echo '<ul class="flags">';
- foreach ($websiteConfig['multiLanguageWebsite']['languages'] as $langCode) {
- foreach ($categoryConfig as $category) {
- if($category['id'] == 0)
- continue;
- if(!isset($category['localized'][$langCode])) {
- $categoryName = GeneralFunctions::getLocalized($category,'name');
- $categoryName = (!empty($categoryName)) ? ' &rArr; '.$categoryName : '';
- echo '<li><img src="'.GeneralFunctions::getFlagHref($langCode).'" class="flag"> '.$languageNames[$langCode].'<a href="'.GeneralFunctions::addParameterToUrl('websiteLanguage',$langCode).'" class="link gray">'.$categoryName.'</a></li>';
- }
- }
- }
- echo '</ul>';
- echo '</div>';
- } else {
+ break;
+
+ // ***** DEFAULT --------------------------------------------------------- *********
+ default:
$currentVisitorFullDetail = false;
$currentVisitors = include('library/includes/currentVisitors.include.php');
if($currentVisitors) {
- echo '<div class="box">';
+ echo '<div class="box currentVisitorsSideBar">';
echo $currentVisitors;
echo '</div>';
}
- }
- break;
-
- // ***** DEFAULT --------------------------------------------------------- *********
- default:
- $currentVisitorFullDetail = false;
- $currentVisitors = include('library/includes/currentVisitors.include.php');
- if($currentVisitors) {
- echo '<div class="box currentVisitorsSideBar">';
- echo $currentVisitors;
- echo '</div>';
- }
- break;
-
-} //switch END
+ break;
-?>
+ } //switch END
+}
View
6 library/styles/less/contentBlocks.less
@@ -257,12 +257,6 @@
margin: 10px -10px;
}
- .inBlockSlider {
- &.hidden {
- display: block; // overwrites the class .hidden in general.less
- }
- }
-
// FORM SPANS
.form {
View
34 library/styles/less/general.less
@@ -53,6 +53,9 @@ a.gray:hover, a.gray:focus {
.hidden {
display: none;
}
+.inBlockSlider.hidden {
+ display: block;
+}
.center {
text-align: center;
@@ -338,10 +341,25 @@ a.up {
background: url("../images/buttons/up.gif") no-repeat 0px 3px !important;
}
+// fast up link
+a.fastUp {
+ z-index: 1;
+ position: fixed;
+ left: 1125px;
+ top: 80px;
+ display: block;
+ width: 66px;
+ height: 65px;
+ text-decoration: none;
+ background: url("../images/buttons/content_fastUp.png") no-repeat;
+ }
+a.fastUp:hover, .mainContent a.fastUp:focus {
+ background-position: 0px -68px;
+ }
+
// SHARED between frontend and backend
-
.headerCornerButtons {
z-index: 2;
position: absolute;
@@ -635,6 +653,20 @@ iframe#fileManagerFrame {
height: 470px;
}
+.tagCloud {
+ max-height: 450px;
+ padding: 5px 0;
+ text-align: center;
+ overflow: auto;
+
+ span, a {
+ background: none !important;
+ padding: 0 !important;
+ color: #668CA6 !important;
+ // text-transform:capitalize;
+ }
+}
+
// FORMS
View
50 library/styles/less/layout.less
@@ -278,10 +278,10 @@ header.main {
// CONTENT
div.mainContent {
+ z-index: 3;
position: relative;
top: 0px;
left: 10px;
- z-index: 0;
float: left;
overflow: visible;
padding: 10px 10px;
@@ -297,22 +297,6 @@ header.main {
p {
margin: 10px 0px;
}
-
- // FAST UP LINK
- a.fastUp {
- z-index: 4;
- position: fixed;
- left: 1108px;
- top: 80px;
- display: block;
- width: 66px;
- height: 65px;
- text-decoration: none;
- background: url("../images/buttons/content_fastUp.png") no-repeat;
- }
- a.fastUp:hover, .mainContent a.fastUp:focus {
- background-position: 0px -68px;
- }
}
// SIDEBARS
@@ -766,8 +750,10 @@ header.main {
z-index: 2;
margin: 30px 0;
padding: 20px 20px;
+ width: 168px;
border: 1px solid #cdcdcd;
line-height: 18px;
+ word-break: break-word;
#gradient > .horizontal(#fff,#fff,#e2e2e2);
#border > .rounded(10px);
#shadow > .both(0,0,8px,0.1,#000,0,0,15px,0.05);
@@ -777,7 +763,20 @@ header.main {
margin-top: -10px;
}
- h1 {
+ .statistics {
+ font-size: 11px;
+ word-break: break-word;
+ }
+
+ .row {
+ margin-left: 0;
+ }
+
+ [class^="span"] {
+ margin-left: 3px;
+ }
+
+ h1,h2,h3 {
margin: 2px -13px;
margin-bottom: 15px;
padding-bottom: 8px;
@@ -786,6 +785,17 @@ header.main {
font-size: 14px;
line-height: 20px;
}
+ h2 {
+ font-size: 13px;
+ margin-bottom: 5px;
+ // border: none;
+ }
+ h3 {
+ margin: 2px -5px;
+ font-size: 12px;
+ border: none;
+ padding: 0;
+ }
.hintIcon {
position: relative;
@@ -824,6 +834,10 @@ header.main {
padding-left: 0px;
background: none;
}
+
+ .tagCloud {
+ max-height: 150px;
+ }
}
}
View
14 library/styles/less/page_dashboard.less
@@ -21,20 +21,6 @@
font-weight: bold;
}
-.tagCloud {
- // width: 100%;
- max-height: 450px;
- padding: 5px 0;
- text-align: center;
- overflow: auto;
-
- span, a {
- background: none !important;
- padding-right: 0px !important;
- color: #668CA6 !important;
- }
-}
-
table.tableChart {
width: 100%;
View
24 library/styles/less/page_editor.less
@@ -28,24 +28,18 @@ div.rteHide {
}
input.submit {
- margin-top: -20px;
+ float:right;
+ margin-top: -30px;
margin-bottom: 10px;
+ margin-right: 353px;
}
+}
- a#hotKeysToogle {
- color: #F8A75D;
-
- &:hover {
- color: #879095;
- }
- }
+#rightSidebar {
// THUMBNAIL
a.uploadPageThumbnail {
- display: block;
- position: absolute;
- top: 25px;
- right: 100px;
+ display: inline-block;
width: 90px;
height: 75px;
background: url("../images/buttons/content_uploadPageThumbnail.png") no-repeat;
@@ -57,11 +51,11 @@ div.rteHide {
}
a.deleteButton {
z-index: 2;
- top: 24px;
- right: 1px;
+ top: -5px;
+ right: -7px;
}
img.thumbnail {
- z-index: 1;
+ max-width: 150px;
}
}
View
2 library/styles/less/thirdpartyFixes.less
@@ -26,7 +26,7 @@
margin-top: 0;
margin-bottom: 3px;
padding-top: 0;
- // font-weight: normal;
+ text-align: center;
color: lighten(@colorBrown,20%)
}
View
123 library/styles/styles.css
@@ -4339,6 +4339,9 @@
.feindura .hidden {
display: none;
}
+.feindura .inBlockSlider.hidden {
+ display: block;
+}
.feindura .center {
text-align: center;
}
@@ -4596,6 +4599,21 @@
padding-left: 16px;
background: url("../images/buttons/up.gif") no-repeat 0px 3px !important;
}
+.feindura a.fastUp {
+ z-index: 1;
+ position: fixed;
+ left: 1125px;
+ top: 80px;
+ display: block;
+ width: 66px;
+ height: 65px;
+ text-decoration: none;
+ background: url("../images/buttons/content_fastUp.png") no-repeat;
+}
+.feindura a.fastUp:hover,
+.feindura .mainContent a.fastUp:focus {
+ background-position: 0px -68px;
+}
.feindura .headerCornerButtons {
z-index: 2;
position: absolute;
@@ -4932,6 +4950,18 @@
width: 732px;
height: 470px;
}
+.feindura .tagCloud {
+ max-height: 450px;
+ padding: 5px 0;
+ text-align: center;
+ overflow: auto;
+}
+.feindura .tagCloud span,
+.feindura .tagCloud a {
+ background: none !important;
+ padding: 0 !important;
+ color: #668CA6 !important;
+}
.feindura input.short {
width: 70px !important;
text-align: center;
@@ -5053,6 +5083,7 @@
margin-top: 0;
margin-bottom: 3px;
padding-top: 0;
+ text-align: center;
color: #e9cdad;
}
.feindura .floating-tip span.hint {
@@ -5746,10 +5777,10 @@
-khtml-text-shadow: 0 1px 1px #dfdfdf;
}
.feindura .mainBody div.mainContent {
+ z-index: 3;
position: relative;
top: 0px;
left: 10px;
- z-index: 0;
float: left;
overflow: visible;
padding: 10px 10px;
@@ -5764,21 +5795,6 @@
.feindura .mainBody div.mainContent p {
margin: 10px 0px;
}
-.feindura .mainBody div.mainContent a.fastUp {
- z-index: 4;
- position: fixed;
- left: 1108px;
- top: 80px;
- display: block;
- width: 66px;
- height: 65px;
- text-decoration: none;
- background: url("../images/buttons/content_fastUp.png") no-repeat;
-}
-.feindura .mainBody div.mainContent a.fastUp:hover,
-.feindura .mainBody div.mainContent .mainContent a.fastUp:focus {
- background-position: 0px -68px;
-}
.feindura .mainBody #leftSidebar {
position: relative;
top: 0px;
@@ -6178,8 +6194,10 @@
z-index: 2;
margin: 30px 0;
padding: 20px 20px;
+ width: 168px;
border: 1px solid #cdcdcd;
line-height: 18px;
+ word-break: break-word;
background: #ffffff;
background-image: linear-gradient(right, #e2e2e2 0%, #ffffff 100%);
background-image: -o-linear-gradient(right, #e2e2e2 0%, #ffffff 100%);
@@ -6203,7 +6221,19 @@
.feindura .mainBody #rightSidebar .box:first-child {
margin-top: -10px;
}
-.feindura .mainBody #rightSidebar .box h1 {
+.feindura .mainBody #rightSidebar .box .statistics {
+ font-size: 11px;
+ word-break: break-word;
+}
+.feindura .mainBody #rightSidebar .box .row {
+ margin-left: 0;
+}
+.feindura .mainBody #rightSidebar .box [class^="span"] {
+ margin-left: 3px;
+}
+.feindura .mainBody #rightSidebar .box h1,
+.feindura .mainBody #rightSidebar .box h2,
+.feindura .mainBody #rightSidebar .box h3 {
margin: 2px -13px;
margin-bottom: 15px;
padding-bottom: 8px;
@@ -6212,6 +6242,16 @@
font-size: 14px;
line-height: 20px;
}
+.feindura .mainBody #rightSidebar .box h2 {
+ font-size: 13px;
+ margin-bottom: 5px;
+}
+.feindura .mainBody #rightSidebar .box h3 {
+ margin: 2px -5px;
+ font-size: 12px;
+ border: none;
+ padding: 0;
+}
.feindura .mainBody #rightSidebar .box .hintIcon {
position: relative;
left: 50px;
@@ -6249,6 +6289,9 @@
padding-left: 0px;
background: none;
}
+.feindura .mainBody #rightSidebar .box .tagCloud {
+ max-height: 150px;
+}
.feindura .mainBody .subMenu {
position: absolute;
top: -8px;
@@ -6698,9 +6741,6 @@
.feindura .mainContent .block .insetBlock {
margin: 10px -10px;
}
-.feindura .mainContent .block .inBlockSlider.hidden {
- display: block;
-}
.feindura .mainContent .block .form .row {
padding: 5px 0;
}
@@ -6818,18 +6858,6 @@
font-size: 33px;
font-weight: bold;
}
-.feindura .tagCloud {
- max-height: 450px;
- padding: 5px 0;
- text-align: center;
- overflow: auto;
-}
-.feindura .tagCloud span,
-.feindura .tagCloud a {
- background: none !important;
- padding-right: 0px !important;
- color: #668CA6 !important;
-}
.feindura table.tableChart {
width: 100%;
font-size: 10px;
@@ -7494,36 +7522,29 @@
padding: 10px;
}
.feindura .editor input.submit {
- margin-top: -20px;
+ float: right;
+ margin-top: -30px;
margin-bottom: 10px;
+ margin-right: 353px;
}
-.feindura .editor a#hotKeysToogle {
- color: #F8A75D;
-}
-.feindura .editor a#hotKeysToogle:hover {
- color: #879095;
-}
-.feindura .editor a.uploadPageThumbnail {
- display: block;
- position: absolute;
- top: 25px;
- right: 100px;
+.feindura #rightSidebar a.uploadPageThumbnail {
+ display: inline-block;
width: 90px;
height: 75px;
background: url("../images/buttons/content_uploadPageThumbnail.png") no-repeat;
background-position: 0 0;
}
-.feindura .editor a.uploadPageThumbnail:hover,
-.feindura .editor a.uploadPageThumbnail:focus {
+.feindura #rightSidebar a.uploadPageThumbnail:hover,
+.feindura #rightSidebar a.uploadPageThumbnail:focus {
background-position: 0px -76px;
}
-.feindura .editor a.deleteButton {
+.feindura #rightSidebar a.deleteButton {
z-index: 2;
- top: 24px;
- right: 1px;
+ top: -5px;
+ right: -7px;
}
-.feindura .editor img.thumbnail {
- z-index: 1;
+.feindura #rightSidebar img.thumbnail {
+ max-width: 150px;
}
.feindura #editablePageTitle {
position: relative;
View
301 library/thirdparty/javascripts/jsMultipleSelect.js
@@ -9,7 +9,7 @@ authors:
- Fabian Vogelsteller [frozeman.de]
requires:
-- core/1.4: [Class,Options,Events]
+- core/1.3: [Class,Options,Events]
provides: [jsMultipleSelect]
@@ -32,59 +32,19 @@ var jsMultipleSelect = new Class({
this.options.removeButton.addClass(this.options.removeButtonClass);
this.options.removeButton.setStyle('cursor','pointer');
- self.selections = $$('.jsMultipleSelect');
- self.selectionDropBoxes = $$('.jsMultipleSelectDestination');
- // GO THROUGH ALL SELECTIONS
- self.selections.each(function(jsMultipleSelect){
+ // GO THROUGH ALL DESTINATIONS
+ $$('.jsMultipleSelectDestination').each(function(jsMultipleSelectDestination){
// prevent double parsing of the jsMultipleSelects
- if(jsMultipleSelect.retrieve('parsed') === true) return;
- else jsMultipleSelect.store('parsed',true);
+ if(jsMultipleSelectDestination.retrieve('parsed') === true) return;
+ else jsMultipleSelectDestination.store('parsed',true);
// vars
- var jsMultipleSelectId = jsMultipleSelect.getProperty('data-jsMultipleSelect'); // to allocate the selection boxes
- var name = jsMultipleSelect.getProperty('data-name'); // later the inputs anme attribute
- var items = [];
+ var jsMultipleSelectId = jsMultipleSelectDestination.getProperty('data-jsMultipleSelect'); // to allocate the selection boxes
+ var jsMultipleSelectDestinationBg = jsMultipleSelectDestination.getStyle('background-color');
var removedItems = [];
- // DROPBOX
- // the <ul> element where all the selections will be droped into
- var dropBox;
- self.selectionDropBoxes.each(function(box){
- if(box.getProperty('data-jsMultipleSelect') == jsMultipleSelectId) {
- dropBox = box;
- return;
- }
- });
-
- // QUIT IF NO DROPBOX was found
- if(typeOf(dropBox) === 'null')
- return;
-
- // get DROPBOX BGCOLOR
- var dropBoxBg = dropBox.getStyle('background-color');
-
- // setup CLEAR DESTINATION
- $$('a.clearJsMultipleSelect').each(function(clearButton){
- if(clearButton.getProperty('data-jsMultipleSelect') == jsMultipleSelectId) {
- clearButton.addEvent('click',function(e){
- e.stop();
- dropBox.getElements('li.jsMultipleSelectItem').dispose();
-
- items.each(function(item){
- var duplicateCount = item.retrieve('duplicateCount');
- if(item.retrieve('remove')) {
- removedItems.erase(item);
- item.setStyle('display','block');
- }
- if(item.retrieve('duplicate'))
- item.store('duplicateCount',1);
-
- });
- });
- }
- });
// CLOSE FUNCTION
var closeFunction = function() {
@@ -102,85 +62,161 @@ var jsMultipleSelect = new Class({
clone.dispose();
};
- // ADD SELECTIONS
- jsMultipleSelect.getChildren('li.jsMultipleSelectItem').each(function(item){
- // vars
- var duplicateCount = 1;
- items.push(item);
- item.setStyle('cursor','pointer');
- var value = item.getProperty('data-value');
+ // GO THROUGH ALL OPTION BOXES
+ $$('.jsMultipleSelect[data-jsMultipleSelect="'+jsMultipleSelectId+'"]').each(function(jsMultipleSelect){
+ // vars
+ var items = [];
+ var name = jsMultipleSelect.getProperty('data-name'); // later the inputs anme attribute
- // store values
- item.store('duplicateCount',duplicateCount);
- // item can be cloned or will be removed
- item.store('remove',(item.getProperty('data-type') === 'remove' || item.getParent('ul.jsMultipleSelect').getProperty('data-type') === 'remove'));
- // item can be add multiple times
- item.store('duplicate',(item.getProperty('data-type') === 'duplicates' || item.getParent('ul.jsMultipleSelect').getProperty('data-type') === 'duplicates'));
+ // setup CLEAR DESTINATION
+ $$('a.clearJsMultipleSelect').each(function(clearButton){
+ if(clearButton.getProperty('data-jsMultipleSelect') == jsMultipleSelectId) {
+ clearButton.addEvent('click',function(e){
+ e.stop();
+ jsMultipleSelectDestination.getElements('li.jsMultipleSelectItem').dispose();
- // create clone, which will be add to the ul.jsMultipleSelectDestination
- var clone = item.clone();
- clone.setStyle('cursor','auto');
+ items.each(function(item){
+ var duplicateCount = item.retrieve('duplicateCount');
+ if(item.retrieve('remove')) {
+ removedItems.erase(item);
+ item.setStyle('display','block');
+ }
+ if(item.retrieve('duplicate'))
+ item.store('duplicateCount',1);
- // add close button
- var close = self.options.removeButton.clone();
- close.addClass(self.options.removeButtonClass);
- close.addEvent('click',closeFunction);
- // form input element
- var input = new Element('input',{
- 'type':'hidden',
- 'name':name+'[]',
- 'value':value
- });
- clone.grab(input,'bottom');
- clone.grab(close,'bottom');