creylopez
/
phpsqlitecms
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

minor fixes

pull/2/head
Mark (ilosuna) 12 years ago
parent
0549ab7439
commit
5c4b23c05b
9 changed files with 61 additions and 58 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      cms/data/content.sqlite
  2. BIN
      cms/data/userdata.sqlite
  3. +2
    -2
      cms/includes/functions.inc.php
  4. +1
    -1
      cms/lang/english.page.lang.php
  5. +1
    -1
      cms/lang/spanish.page.lang.php
  6. +1
    -2
      cms/templates/default.tpl
  7. +4
    -4
      cms/templates/subtemplates/image.inc.tpl
  8. +19
    -18
      static/css/style.css
  9. +33
    -30
      static/js/mylightbox.js

BIN
cms/data/content.sqlite View File


BIN
cms/data/userdata.sqlite View File


+ 2
- 2
cms/includes/functions.inc.php View File

@ -454,7 +454,7 @@ function create_image($string)
if(isset($img_class)) $image['class'] = htmlspecialchars($img_class);
$template->assign('image', $image);
}
$image_code = $template->fetch(BASE_PATH.'templates/subtemplates/image.inc.tpl');
$image_code = $template->fetch(BASE_PATH.'cms/templates/subtemplates/image.inc.tpl');
return $image_code;
}
@ -521,7 +521,7 @@ function create_thumbnail_rss($string)
#else $thumbnail = '<a href="'.$page.',photo,'.$id.'"><img src="images/'.$data['photo_thumbnail'].'" title="'.htmlspecialchars(strip_tags(stripslashes($data['title']))).'" alt="'.htmlspecialchars(strip_tags(stripslashes($data['title']))).'" width="'.$width.'" height="'.$height.'" /></a>';
$template->assign('thumbnail', $thumbnail);
}
$thumbnail = $template->fetch(BASE_PATH.'templates/subtemplates/thumbnail_rss.inc.tpl');
$thumbnail = $template->fetch(BASE_PATH.'cms/templates/subtemplates/thumbnail_rss.inc.tpl');
return $thumbnail;
}


+ 1
- 1
cms/lang/english.page.lang.php View File

@ -142,5 +142,5 @@ $lang['search_no_results'] = 'No pages found';
// Akismet:
$lang['akismet_error_api_key'] = 'Invalid akismet api key';
$lang['akismet_error_connection'] = 'Server connection error - please try again later';
$lang['akismet_spam_suspicion'] = 'Spam suspicion!'
$lang['akismet_spam_suspicion'] = 'Spam suspicion!';
?>

+ 1
- 1
cms/lang/spanish.page.lang.php View File

@ -142,5 +142,5 @@ $lang['search_no_results'] = 'No se ha encontrado ninguna página';
// Akismet:
$lang['akismet_error_api_key'] = 'La clave del API Akismet es incorrecta';
$lang['akismet_error_connection'] = 'Error de conexión al servidor - por favor, inténtelo de nuevo más tarde';
$lang['akismet_spam_suspicion'] = '¡Sospecha de Spam!'
$lang['akismet_spam_suspicion'] = '¡Sospecha de Spam!';
?>

+ 1
- 2
cms/templates/default.tpl View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en" dir="<?php echo $lang['dir']; ?>">
<html lang="<?php echo $lang['lang']; ?>" dir="<?php echo $lang['dir']; ?>">
<head>
<meta charset="<?php echo $lang['charset']; ?>" />
<title><?php if($page_title): ?><?php echo $page_title; ?><?php else: ?><?php if($title): ?><?php echo $title; ?> - <?php endif; ?><?php echo $settings['website_title']; ?><?php endif; ?></title>
@ -69,7 +69,6 @@
<?php if($sidebar_2): ?>
<div class="col-md-3 sidebar">
<hr class="visible-xs">
<?php echo $sidebar_2; ?>
</div>
<?php endif; ?>


+ 4
- 4
cms/templates/subtemplates/image.inc.tpl View File

@ -1,5 +1,5 @@
<?php if(isset($image)): ?>
<img<?php if(isset($image['class'])): ?> class="<?php echo $image['class']; ?>" <?php endif; ?>src="<?php echo BASE_URL.MEDIA_DIR.$image['image']; ?>" title="<?php echo $image['alt']; ?>" alt="<?php echo $image['alt']; ?>" width="<?php echo $image['width']; ?>" height="<?php echo $image['height']; ?>" />
<?php else: ?>
<span class="missing">[ missing image ]</span>
<?php endif; ?>
<img<?php if(isset($image['class'])): ?> class="<?php echo $image['class']; ?>" <?php endif; ?> src="<?php echo BASE_URL.MEDIA_DIR.$image['image']; ?>" title="<?php echo $image['alt']; ?>" alt="<?php echo $image['alt']; ?>" width="<?php echo $image['width']; ?>" height="<?php echo $image['height']; ?>" />
<?php else: ?>
<span class="missing">[ missing image ]</span>
<?php endif; ?>

+ 19
- 18
static/css/style.css View File

@ -83,24 +83,6 @@ h4.author { font-size:14px; margin-bottom:5px; font-style:italic; }
a.rss { padding-left:23px; background:url(../img/rss.png) no-repeat left; }
a.pdf { padding-left:23px; background-image:url(../img/pdf.png); background-repeat:no-repeat; background-position: top left; }
#mylightbox-background { display:none; position:fixed; height:100%; width:100%; top:0; left:0; background:#000; border:1px solid #cecece; z-index:2000; }
#mylightbox { width:400px; display:none; position:absolute; background:#fff; z-index:2000; padding:3px 10px 0 10px; font-size:13px; border:1px solid #cecece; border-radius:5px; max-width:90%; height:auto; box-shadow:5px 5px 20px #000; }
#mylightbox img { max-width:100%; height:auto; }
#mylightbox-header { height:20px; font-size:13px; line-height:20px; padding:0 0 3px 0; }
#mylightbox-title { position:absolute; top:2px; left:10px; width:40%; margin:0; padding:0; font-weight:bold; }
#mylightbox-nav { position:absolute; top:2px; left:40%; width:20%; margin:0; padding:0; text-align:center; float:left; white-space:nowrap; }
#mylightbox-controls { position:absolute; top:4px; right:10px; width:14px; margin:0; padding:0; }
#mylightbox #photo { margin:0; padding:0; }
#mylightbox-subtitle { font-size:14px; line-height:150%; margin:0; padding:3px 0 0 0; font-style:italic; color:#808080; }
#mylightbox-description { font-size:14px; line-height:150%; margin:0; padding:3px 0 8px 0; }
#mylightbox-throbber { width:32px; height:32px; margin:0 auto 0 auto; padding:100px 0; background:url(../img/throbber.gif) no-repeat center; }
#mylightbox-prev { vertical-align:text-top; display:inline-block; width:16px; height:16px; margin:0; padding:0; }
#mylightbox-prev:hover { opacity:0.75; }
#mylightbox-next { vertical-align:text-top; display:inline-block; width:16px; height:16px; margin:0; padding:0; }
#mylightbox-next:hover { opacity:0.75; }
#mylightbox-close { width:14px; height:14px; display:inline-block; }
#mylightbox-close:hover { width:14px; height:14px; display:inline-block; }
@media (min-width: 992px)
{
.header .nav { margin-top:37px; float:right; text-align:right; }
@ -116,3 +98,22 @@ a.pdf { padding-left:23px; background-image:url(../img/p
#nav .nav-pills > li > a { padding: 10px 15px; border-radius:0; }
#nav .nav-pills > li + li > a { margin-top: 2px; margin-left: 0; }
}
#mylightbox-background { display:none; position:fixed; height:100%; width:100%; top:0; left:0; background:#000; border:1px solid #cecece; z-index:2000; }
#mylightbox { width:400px; display:none; position:absolute; background:#fff; z-index:2000; padding:3px 10px 0 10px; font-size:13px; border:1px solid #cecece; border-radius:5px; max-width:90%; height:auto; box-shadow:5px 5px 20px #000; }
#mylightbox img { max-width:100%; height:auto; }
#mylightbox-header { height:25px; font-size:13px; line-height:20px; padding:0 0 10px 0; }
#mylightbox-title { position:absolute; top:3px; left:10px; width:90%; margin:0; padding:0; font-weight:bold; }
#mylightbox-controls { position:absolute; top:5px; right:10px; width:14px; margin:0; padding:0; }
#mylightbox #photo { margin:0; padding:0; }
#mylightbox-subtitle { font-size:14px; line-height:150%; margin:0; padding:3px 0 0 0; font-style:italic; color:#808080; }
#mylightbox-description { font-size:14px; line-height:150%; margin:0; padding:5px 0 8px 0; }
#mylightbox-author { color:#808080; font-size:13px; margin:-8px 0 0 0; padding:0 0 8px 0; }
#mylightbox-throbber { width:32px; height:32px; margin:0 auto 0 auto; padding:100px 0; background:url(../img/throbber.gif) no-repeat center; }
#mylightbox-photo { position:relative; }
#mylightbox-prev { width:25%; position:absolute; top:0; left:0; bottom:0; background:url(../img/prev.png) no-repeat -1000px 0; z-index:10000; text-indent:-999em; outline:none; }
#mylightbox-prev:hover { background:url(../img/prev.png) no-repeat 10% center, linear-gradient(to left, rgba(0,0,0,0), rgba(0,0,0,0.2)); }
#mylightbox-next { width:25%; position:absolute; top:0; right:0; bottom:0; background:url(../img/next.png) no-repeat 1000px 0; z-index:10000; text-indent:-999em; outline:none; }
#mylightbox-next:hover { background:url(../img/next.png) no-repeat 90% center, linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.2)); }
#mylightbox-close { width:16px; height:16px; display:inline-block; text-indent:-999em; background:url(../img/close_button.png) no-repeat 0 0; outline:none; opacity:0.7; }
#mylightbox-close:hover { opacity:1; }

+ 33
- 30
static/js/mylightbox.js View File

@ -3,21 +3,20 @@
/********************************************************/
myLightboxSettings = new Object();
myLightboxSettings['vertical_align'] = 30; // 'center' or number of pixels from top
myLightboxSettings['next_link'] = '<span class="glyphicon glyphicon-arrow-right text-success"></span>';
myLightboxSettings['next_link'] = '[&raquo;]';
myLightboxSettings['next_link_title'] = 'next';
myLightboxSettings['previous_link'] = '<span class="glyphicon glyphicon-arrow-left text-success"></span>';
myLightboxSettings['previous_link'] = '[&laquo;]';
myLightboxSettings['previous_link_title'] = 'previous';
myLightboxSettings['close_link'] = '<span class="glyphicon glyphicon-remove text-danger"></span>';
myLightboxSettings['close_link'] = '[x]';
myLightboxSettings['close_link_title'] = 'close';
myLightboxSettings['html_box'] = '<div id="mylightbox">\
<div id="mylightbox-header">\
<div id="mylightbox-title"></div>\
<div id="mylightbox-nav"></div>\
<div id="mylightbox-controls"><a href="#" id="mylightbox-close" title="'+myLightboxSettings['close_link_title']+'" onclick="return false"><span>'+myLightboxSettings['close_link']+'</span></a></div>\
</div>\
<div id="mylightbox-photo"></div>\
<p id="mylightbox-subtitle"></p>\
<p id="mylightbox-description"></p>\
<p id="mylightbox-author"></p>\
</div>';
myLightboxSettings['html_background'] = '<div id="mylightbox-background"></div>';
@ -122,8 +121,8 @@ function doit(e,t)
var myLightboxLinks = new Array();
var srcs = new Array();
var titles = new Array();
var subtitles = new Array();
var descriptions = new Array();
var authors = new Array();
//$(".mylightbox").each(function(i) // get all links with class="mylightbox"
$("a[data-lightbox]").each(function(i) // get all links with rel="mylightbox"
@ -132,15 +131,15 @@ function doit(e,t)
myLightboxLinks.push($(this));
srcs.push($(this).attr('href'));
titles.push($(this).find('img').attr('title'));
subtitles.push($(this).find('img').attr('data-subtitle'));
descriptions.push($(this).find('img').attr('data-description'));
authors.push($(this).find('img').attr('data-author'));
});
var numberOfImages = myLightboxLinks.length;
var src = srcs[mylightboxCurrent];
var title = titles[mylightboxCurrent];
var subtitle = subtitles[mylightboxCurrent];
var description = descriptions[mylightboxCurrent];
var author = authors[mylightboxCurrent];
// determine previous and next image:
if(numberOfImages>1)
@ -167,19 +166,8 @@ function doit(e,t)
if(typeof(myLightboxCurrentWidth)!='undefined') $("#mylightbox").css({"width":myLightboxCurrentWidth+'px'});
// previous and next buttons:
if(typeof(prev)!='undefined' && typeof(next)!='undefined')
{
$("#mylightbox #mylightbox-nav").html('<a id="mylightbox-prev" href="'+$(prev).attr('href')+'" title="'+myLightboxSettings['previous_link_title']+'"><span>'+myLightboxSettings['previous_link']+'</span></a> &nbsp; <a id="mylightbox-next" href="'+$(next).attr('href')+'" title="'+myLightboxSettings['next_link_title']+'">'+myLightboxSettings['next_link']+'</a>');
}
else
{
$("#mylightbox #mylightbox-nav").html('&nbsp;');
}
$("#mylightbox #mylightbox-title").html('');
$("#mylightbox-photo").html('<div id="mylightbox-throbber"></div>');
$("#mylightbox-subtitle").html('');
$("#mylightbox-description").html('');
if(typeof(myLightboxCurrentWidth)=='undefined') centerPopup($("#mylightbox").outerWidth(), $("#mylightbox").outerHeight());
@ -189,7 +177,7 @@ function doit(e,t)
{
$("#mylightbox #mylightbox-title").html(title);
$("#mylightbox-photo").hide();
if(typeof(next)!='undefined')
/*if(typeof(next)!='undefined')
{
$("#mylightbox-photo").html('<a id="mylightbox-next-img" href="'+$(next).attr('href')+'"><img src="'+src+'" /></a>');
$("#mylightbox-next-img").click(function(e){ doit(e,next); });
@ -198,9 +186,32 @@ function doit(e,t)
{
$("#mylightbox-photo").html('<img src="'+src+'" />');
}
*/
$("#mylightbox-photo").html('<img src="'+src+'">');
// previous and next buttons:
if(typeof(prev)!='undefined' && typeof(next)!='undefined')
{
$("#mylightbox-photo").append('<a id="mylightbox-prev" href="'+$(prev).attr('href')+'" title="'+myLightboxSettings['previous_link_title']+'"><span>'+myLightboxSettings['previous_link']+'</span></a>');
$("#mylightbox-photo").append('<a id="mylightbox-next" href="'+$(next).attr('href')+'" title="'+myLightboxSettings['next_link_title']+'"><span>'+myLightboxSettings['next_link']+'</span></a>');
$("#mylightbox-prev").click(function(e) { doit(e,prev); });
$("#mylightbox-next").click(function(e) { doit(e,next); });
if(typeof Hammer == 'function')
{
var hammertime = $("#mylightbox-photo").hammer();
hammertime.on("swipeleft", function(e) { doit(e,next); });
hammertime.on("swiperight", function(e) { doit(e,prev); });
}
}
else
{
//$("#mylightbox-prev").remove();
//$("#mylightbox-next").remove();
}
$("#mylightbox-subtitle").html(subtitle);
$("#mylightbox-description").html(description);
$("#mylightbox-author").html(author);
$("#mylightbox-photo").fadeIn("fast");
myLightboxCurrentWidth = objImagePreloader.width;
@ -210,15 +221,7 @@ function doit(e,t)
};
objImagePreloader.src = src;
$("#mylightbox-next").click(function(e){
doit(e,next);
});
$("#mylightbox-prev").click(function(e){
doit(e,prev);
});
}
$(function()


Write Preview
Loading…
Cancel
Save