From 5c4b23c05bde9c84e4e7987e9b953c9e4494674a Mon Sep 17 00:00:00 2001 From: "Mark (ilosuna)" Date: Sat, 16 Nov 2013 14:26:58 +0100 Subject: [PATCH] minor fixes --- cms/data/content.sqlite | Bin 393216 -> 393216 bytes cms/data/userdata.sqlite | Bin 4096 -> 4096 bytes cms/includes/functions.inc.php | 4 +- cms/lang/english.page.lang.php | 2 +- cms/lang/spanish.page.lang.php | 2 +- cms/templates/default.tpl | 3 +- cms/templates/subtemplates/image.inc.tpl | 8 +-- static/css/style.css | 37 ++++++------- static/js/mylightbox.js | 63 ++++++++++++----------- 9 files changed, 61 insertions(+), 58 deletions(-) diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite index 2e2b98907394b716df31d441a984cf706999e0af..eba20400fc16e9c08783ab9cf837d493515f4c6f 100644 GIT binary patch delta 576 zcmYj~T}V@L7{<@pyMHcoZnC)?)2Yldw4#NMav4b<_(cRUvu^f5hh~w-eb{#XALne4 z2wjL8_RmN!La;I-B|AYH1PNXCff7ZxwIpcJMVIBWpy%R!;d$Qo_hd2^nM}o~OLUJ_ z9u?i$&`?NR3>ohH(q!ROY67udc8M{~lX|D-$rOE|cBt3sd(F>AwNiDKttnqv9-Gu9 zm9QGMTuG7~Th@B;SK?wPn4mmO@1hUr5FMarsa<(XZ(uaWWiAs(q^=Ta&vJStSO_nY43i0AqC4K!c;&4mlde9m34u$ zDm<8s%JEJ)+Fx@_miU|kZydxXn1l_L_@LSx2`8lBKsXuY;~37EODe%>i%W?_!@(tUArOJ|NsBPXjWl%IIn`9SB=iB zczm%KJ?<2*&1b2o`@7M4ouTy8Sk`TrI>75=XoulejGv4l&z5*&d!b}Eg+2OA3_UUM z$uu%^)`F~j{R-NyKTM+2+YJ6y4jJSz9x`e7=CdpN^zV<*=VJcjC9)gOO>b=-Yjg3{ hXQ}zd{$b-pnVes%r^j!b8go;f1&K2~b|t4F;T{uQKB)SHGy$!0@I@Z^~)Io%BQl`9Y9q54yHEX+`r^tdTjwzgl(QIE>KSj}RL;DYae7H5vx-EOpf|ImY+`9iMt+f3 zeny^xOMYrq7X!=m)s@T_#dyq^<$045i&NtZ5=%0wSs6GOfMEKhD(3L%->aBqrF|Iq zKq3&pBf~5yT$EazS(R#LVlZ8+npvB(R*``dEIU24n%Q#t+-hcTeqLE-d47nx_=?Jk z?JugCIT)waG8+oiPG=B+nFgY#8`d(bPtUGpc3`|SeN8R1marfrv!ZBbUP@{O&`Ig3 z8Tq-X)34Ps$4~dHV_q&&KaD{ISwD!~{-KU}`-eIf$wo%itz4{Iycn}KHr6n1xAtLu zrNT5fV!C@Ft18oM!|8d2tjcT}TRlKV>eMjnZa-4Ux{XP+z|JO7A)_cY%~nZS$<8f5 zKVMHzZ~8%VR;lUrR;+x}UzM?nZ(mo!8qCe)@_9OQ1FJHN_0{^78yk-rY=6Ij^%>W6 hjy(^b delta 21 ccmZorXi%6S%~&;2#+k8dW5Qg1X5~{107%>he*gdg diff --git a/cms/includes/functions.inc.php b/cms/includes/functions.inc.php index 846d42b..ba84ece 100644 --- a/cms/includes/functions.inc.php +++ b/cms/includes/functions.inc.php @@ -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 = ''.htmlspecialchars(strip_tags(stripslashes($data['title']))).''; $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; } diff --git a/cms/lang/english.page.lang.php b/cms/lang/english.page.lang.php index 6aa0764..d6d2b1f 100644 --- a/cms/lang/english.page.lang.php +++ b/cms/lang/english.page.lang.php @@ -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!'; ?> diff --git a/cms/lang/spanish.page.lang.php b/cms/lang/spanish.page.lang.php index 2a2a151..9a57d0f 100644 --- a/cms/lang/spanish.page.lang.php +++ b/cms/lang/spanish.page.lang.php @@ -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!'; ?> diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl index 73e44d7..9a48908 100644 --- a/cms/templates/default.tpl +++ b/cms/templates/default.tpl @@ -1,5 +1,5 @@ - + <?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; ?> @@ -69,7 +69,6 @@
-
diff --git a/cms/templates/subtemplates/image.inc.tpl b/cms/templates/subtemplates/image.inc.tpl index 5f9dec4..19749c3 100644 --- a/cms/templates/subtemplates/image.inc.tpl +++ b/cms/templates/subtemplates/image.inc.tpl @@ -1,5 +1,5 @@ - class="" src="" title="" alt="" width="" height="" /> - -[ missing image ] - + class="" src="" title="" alt="" width="" height="" /> + +[ missing image ] + diff --git a/static/css/style.css b/static/css/style.css index d1c4271..cdc8c58 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -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; } diff --git a/static/js/mylightbox.js b/static/js/mylightbox.js index efc2708..f790f74 100644 --- a/static/js/mylightbox.js +++ b/static/js/mylightbox.js @@ -3,21 +3,20 @@ /********************************************************/ myLightboxSettings = new Object(); myLightboxSettings['vertical_align'] = 30; // 'center' or number of pixels from top -myLightboxSettings['next_link'] = ''; +myLightboxSettings['next_link'] = '[»]'; myLightboxSettings['next_link_title'] = 'next'; -myLightboxSettings['previous_link'] = ''; +myLightboxSettings['previous_link'] = '[«]'; myLightboxSettings['previous_link_title'] = 'previous'; -myLightboxSettings['close_link'] = ''; +myLightboxSettings['close_link'] = '[x]'; myLightboxSettings['close_link_title'] = 'close'; myLightboxSettings['html_box'] = ''; myLightboxSettings['html_background'] = '
'; @@ -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(''+myLightboxSettings['previous_link']+'   '+myLightboxSettings['next_link']+''); - } - else - { - $("#mylightbox #mylightbox-nav").html(' '); - } - $("#mylightbox #mylightbox-title").html(''); $("#mylightbox-photo").html('
'); - $("#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(''); $("#mylightbox-next-img").click(function(e){ doit(e,next); }); @@ -198,9 +186,32 @@ function doit(e,t) { $("#mylightbox-photo").html(''); } + */ + $("#mylightbox-photo").html(''); + + // previous and next buttons: + if(typeof(prev)!='undefined' && typeof(next)!='undefined') + { + $("#mylightbox-photo").append(''+myLightboxSettings['previous_link']+''); + $("#mylightbox-photo").append(''+myLightboxSettings['next_link']+''); + $("#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()