diff --git a/config/users/username.ini.example b/config/users/username.ini.example index f2f5c0b..befaed5 100644 --- a/config/users/username.ini.example +++ b/config/users/username.ini.example @@ -1,3 +1,5 @@ ;Password password = yourpassword + +;Role role = admin \ No newline at end of file diff --git a/system/includes/functions.php b/system/includes/functions.php index 1eb07cb..becce72 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -1384,7 +1384,11 @@ function head_contents($title, $description, $canonical) { $sitemap = ''; $canonical = ''; $feed = ''; - $output .= $title ."\n". $favicon ."\n". $charset ."\n". $generator ."\n". $xua ."\n". $viewport ."\n". $description ."\n". $sitemap ."\n". $canonical ."\n". $feed ."\n"; + $lightboxcss = ''; + $jquery = ''; + $lightbox = ''; + $corejs = ''; + $output .= $title ."\n". $favicon ."\n". $charset ."\n". $generator ."\n". $xua ."\n". $viewport ."\n". $description ."\n". $sitemap ."\n". $canonical ."\n". $feed ."\n". $lightboxcss ."\n". $jquery ."\n". $lightbox ."\n" .$corejs ."\n"; return $output; } diff --git a/system/plugins/lightbox/README.md b/system/plugins/lightbox/README.md new file mode 100644 index 0000000..a6372e9 --- /dev/null +++ b/system/plugins/lightbox/README.md @@ -0,0 +1,15 @@ +## Lightbox2 +by Lokesh Dhakar | [lokeshdhakar.com](http://www.lokeshdhakar.com) | [twitter.com/lokesh](http://twitter.com/lokesh) + +### Information and support +For examples, downloads, and information on using Lightbox, visit the Lightbox2 homepage: +[http://lokeshdhakar.com/projects/lightbox2/](http://lokeshdhakar.com/projects/lightbox2/) + +For personal support issues and feature requests, visit the Lightbox forums: +[http://lokeshdhakar.com/forums/](http://lokeshdhakar.com/forums/) + +### License +Licensed under the Creative Commons Attribution 2.5 License - http://creativecommons.org/licenses/by/2.5/ + +* Free for use in both personal and commercial projects. +* Attribution requires leaving author name, author homepage link, and the license info intact. diff --git a/system/plugins/lightbox/css/lightbox.css b/system/plugins/lightbox/css/lightbox.css new file mode 100644 index 0000000..3ce096a --- /dev/null +++ b/system/plugins/lightbox/css/lightbox.css @@ -0,0 +1,207 @@ +/* line 7, ../sass/lightbox.sass */ +body:after { + content: url(../img/close.png) url(../img/loading.gif) url(../img/prev.png) url(../img/next.png); + display: none; +} + +/* line 11, ../sass/lightbox.sass */ +.lightboxOverlay { + position: absolute; + top: 0; + left: 0; + z-index: 9999; + background-color: black; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); + opacity: 0.8; + display: none; +} + +/* line 20, ../sass/lightbox.sass */ +.lightbox { + position: absolute; + left: 0; + width: 100%; + z-index: 10000; + text-align: center; + line-height: 0; + font-weight: normal; +} +/* line 28, ../sass/lightbox.sass */ +.lightbox .lb-image { + display: block; + height: auto; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; +} +/* line 32, ../sass/lightbox.sass */ +.lightbox a img { + border: none; +} + +/* line 35, ../sass/lightbox.sass */ +.lb-outerContainer { + position: relative; + background-color: white; + *zoom: 1; + width: 250px; + height: 250px; + margin: 0 auto; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + -ms-border-radius: 4px; + -o-border-radius: 4px; + border-radius: 4px; +} +/* line 38, ../../../../.rvm/gems/ruby-1.9.3-p392/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.scss */ +.lb-outerContainer:after { + content: ""; + display: table; + clear: both; +} + +/* line 44, ../sass/lightbox.sass */ +.lb-container { + padding: 4px; +} + +/* line 47, ../sass/lightbox.sass */ +.lb-loader { + position: absolute; + top: 43%; + left: 0%; + height: 25%; + width: 100%; + text-align: center; + line-height: 0; +} + +/* line 56, ../sass/lightbox.sass */ +.lb-cancel { + display: block; + width: 32px; + height: 32px; + margin: 0 auto; + background: url(../img/loading.gif) no-repeat; +} + +/* line 63, ../sass/lightbox.sass */ +.lb-nav { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + z-index: 10; +} + +/* line 71, ../sass/lightbox.sass */ +.lb-container > .nav { + left: 0; +} + +/* line 74, ../sass/lightbox.sass */ +.lb-nav a { + outline: none; +} + +/* line 77, ../sass/lightbox.sass */ +.lb-prev, .lb-next { + width: 49%; + height: 100%; + cursor: pointer; + /* Trick IE into showing hover */ + display: block; +} + +/* line 84, ../sass/lightbox.sass */ +.lb-prev { + left: 0; + float: left; +} +/* line 87, ../sass/lightbox.sass */ +.lb-prev:hover { + background: url(../img/prev.png) left 48% no-repeat; +} + +/* line 90, ../sass/lightbox.sass */ +.lb-next { + right: 0; + float: right; +} +/* line 93, ../sass/lightbox.sass */ +.lb-next:hover { + background: url(../img/next.png) right 48% no-repeat; +} + +/* line 96, ../sass/lightbox.sass */ +.lb-dataContainer { + margin: 0 auto; + padding-top: 5px; + *zoom: 1; + width: 100%; + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; +} +/* line 38, ../../../../.rvm/gems/ruby-1.9.3-p392/gems/compass-0.12.2/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.scss */ +.lb-dataContainer:after { + content: ""; + display: table; + clear: both; +} + +/* line 103, ../sass/lightbox.sass */ +.lb-data { + padding: 0 4px; + color: #bbbbbb; +} +/* line 106, ../sass/lightbox.sass */ +.lb-data .lb-details { + width: 85%; + float: left; + text-align: left; + line-height: 1.1em; +} +/* line 111, ../sass/lightbox.sass */ +.lb-data .lb-caption { + font-size: 13px; + font-weight: bold; + line-height: 1em; +} +/* line 115, ../sass/lightbox.sass */ +.lb-data .lb-number { + display: block; + clear: left; + padding-bottom: 1em; + font-size: 12px; + color: #999999; +} +/* line 121, ../sass/lightbox.sass */ +.lb-data .lb-close { + display: block; + float: right; + width: 30px; + height: 30px; + background: url(../img/close.png) top right no-repeat; + text-align: right; + outline: none; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70); + opacity: 0.7; +} +/* line 130, ../sass/lightbox.sass */ +.lb-data .lb-close:hover { + cursor: pointer; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100); + opacity: 1; +} + +/* fix image preview */ +.lb-image { + max-width: inherit!important; +} \ No newline at end of file diff --git a/system/plugins/lightbox/img/close.png b/system/plugins/lightbox/img/close.png new file mode 100644 index 0000000..20baa1d Binary files /dev/null and b/system/plugins/lightbox/img/close.png differ diff --git a/system/plugins/lightbox/img/loading.gif b/system/plugins/lightbox/img/loading.gif new file mode 100644 index 0000000..5087c2a Binary files /dev/null and b/system/plugins/lightbox/img/loading.gif differ diff --git a/system/plugins/lightbox/img/next.png b/system/plugins/lightbox/img/next.png new file mode 100644 index 0000000..08365ac Binary files /dev/null and b/system/plugins/lightbox/img/next.png differ diff --git a/system/plugins/lightbox/img/prev.png b/system/plugins/lightbox/img/prev.png new file mode 100644 index 0000000..329fa98 Binary files /dev/null and b/system/plugins/lightbox/img/prev.png differ diff --git a/system/plugins/lightbox/js/lightbox-2.6.min.js b/system/plugins/lightbox/js/lightbox-2.6.min.js new file mode 100644 index 0000000..fe7360a --- /dev/null +++ b/system/plugins/lightbox/js/lightbox-2.6.min.js @@ -0,0 +1 @@ +(function(){var b,d,c;b=jQuery;c=(function(){function b(){this.fadeDuration=500;this.fitImagesInViewport=true;this.resizeDuration=700;this.showImageNumberLabel=true;this.wrapAround=false}b.prototype.albumLabel=function(b,c){return"Image "+b+" of "+c};return b})();d=(function(){function c(b){this.options=b;this.album=[];this.currentImageIndex=void 0;this.init()}c.prototype.init=function(){this.enable();return this.build()};c.prototype.enable=function(){var c=this;return b('body').on('click','a[rel^=lightbox], area[rel^=lightbox], a[data-lightbox], area[data-lightbox]',function(d){c.start(b(d.currentTarget));return false})};c.prototype.build=function(){var c=this;b("
").appendTo(b('body'));this.$lightbox=b('#lightbox');this.$overlay=b('#lightboxOverlay');this.$outerContainer=this.$lightbox.find('.lb-outerContainer');this.$container=this.$lightbox.find('.lb-container');this.containerTopPadding=parseInt(this.$container.css('padding-top'),10);this.containerRightPadding=parseInt(this.$container.css('padding-right'),10);this.containerBottomPadding=parseInt(this.$container.css('padding-bottom'),10);this.containerLeftPadding=parseInt(this.$container.css('padding-left'),10);this.$overlay.hide().on('click',function(){c.end();return false});this.$lightbox.hide().on('click',function(d){if(b(d.target).attr('id')==='lightbox'){c.end()}return false});this.$outerContainer.on('click',function(d){if(b(d.target).attr('id')==='lightbox'){c.end()}return false});this.$lightbox.find('.lb-prev').on('click',function(){if(c.currentImageIndex===0){c.changeImage(c.album.length-1)}else{c.changeImage(c.currentImageIndex-1)}return false});this.$lightbox.find('.lb-next').on('click',function(){if(c.currentImageIndex===c.album.length-1){c.changeImage(0)}else{c.changeImage(c.currentImageIndex+1)}return false});return this.$lightbox.find('.lb-loader, .lb-close').on('click',function(){c.end();return false})};c.prototype.start=function(c){var f,e,j,d,g,n,o,k,l,m,p,h,i;b(window).on("resize",this.sizeOverlay);b('select, object, embed').css({visibility:"hidden"});this.$overlay.width(b(document).width()).height(b(document).height()).fadeIn(this.options.fadeDuration);this.album=[];g=0;j=c.attr('data-lightbox');if(j){h=b(c.prop("tagName")+'[data-lightbox="'+j+'"]');for(d=k=0,m=h.length;kj)||(c.height>i)){if((c.width/j)>(c.height/i)){h=j;g=parseInt(c.height/(c.width/h),10);d.width(h);d.height(g)}else{g=i;h=parseInt(c.width/(c.height/g),10);d.width(h);d.height(g)}}}return e.sizeContainer(d.width(),d.height())};c.src=this.album[f].link;this.currentImageIndex=f};c.prototype.sizeOverlay=function(){return b('#lightboxOverlay').width(b(document).width()).height(b(document).height())};c.prototype.sizeContainer=function(f,g){var b,d,e,h,c=this;h=this.$outerContainer.outerWidth();e=this.$outerContainer.outerHeight();d=f+this.containerLeftPadding+this.containerRightPadding;b=g+this.containerTopPadding+this.containerBottomPadding;this.$outerContainer.animate({width:d,height:b},this.options.resizeDuration,'swing');setTimeout(function(){c.$lightbox.find('.lb-dataContainer').width(d);c.$lightbox.find('.lb-prevLink').height(b);c.$lightbox.find('.lb-nextLink').height(b);c.showImage()},this.options.resizeDuration)};c.prototype.showImage=function(){this.$lightbox.find('.lb-loader').hide();this.$lightbox.find('.lb-image').fadeIn('slow');this.updateNav();this.updateDetails();this.preloadNeighboringImages();this.enableKeyboardNav()};c.prototype.updateNav=function(){this.$lightbox.find('.lb-nav').show();if(this.album.length>1){if(this.options.wrapAround){this.$lightbox.find('.lb-prev, .lb-next').show()}else{if(this.currentImageIndex>0){this.$lightbox.find('.lb-prev').show()}if(this.currentImageIndex1&&this.options.showImageNumberLabel){this.$lightbox.find('.lb-number').text(this.options.albumLabel(this.currentImageIndex+1,this.album.length)).fadeIn('fast')}else{this.$lightbox.find('.lb-number').hide()}this.$outerContainer.removeClass('animating');this.$lightbox.find('.lb-dataContainer').fadeIn(this.resizeDuration,function(){return b.sizeOverlay()})};c.prototype.preloadNeighboringImages=function(){var c,b;if(this.album.length>this.currentImageIndex+1){c=new Image();c.src=this.album[this.currentImageIndex+1].link}if(this.currentImageIndex>0){b=new Image();b.src=this.album[this.currentImageIndex-1].link}};c.prototype.enableKeyboardNav=function(){b(document).on('keyup.keyboard',b.proxy(this.keyboardAction,this))};c.prototype.disableKeyboardNav=function(){b(document).off('.keyboard')};c.prototype.keyboardAction=function(g){var d,e,f,c,b;d=27;e=37;f=39;b=g.keyCode;c=String.fromCharCode(b).toLowerCase();if(b===d||c.match(/x|o|c/)){this.end()}else if(c==='p'||b===e){if(this.currentImageIndex!==0){this.changeImage(this.currentImageIndex-1)}}else if(c==='n'||b===f){if(this.currentImageIndex!==this.album.length-1){this.changeImage(this.currentImageIndex+1)}}};c.prototype.end=function(){this.disableKeyboardNav();b(window).off("resize",this.sizeOverlay);this.$lightbox.fadeOut(this.options.fadeDuration);this.$overlay.fadeOut(this.options.fadeDuration);return b('select, object, embed').css({visibility:"visible"})};return c})();b(function(){var e,b;b=new c();return e=new d(b)})}).call(this); \ No newline at end of file diff --git a/system/resources/htmly.js b/system/resources/htmly.js new file mode 100644 index 0000000..466a7f5 --- /dev/null +++ b/system/resources/htmly.js @@ -0,0 +1,10 @@ +(function ($) { + + $(document).ready(function() { + $('.post-teaser img, .post-body img').each(function() { + var currentImage = $(this); + currentImage.wrap(""); + }); + }); + +})(jQuery); \ No newline at end of file diff --git a/themes/logs/css/style.css b/themes/logs/css/style.css index fc8e55a..423580c 100644 --- a/themes/logs/css/style.css +++ b/themes/logs/css/style.css @@ -12,7 +12,7 @@ body { line-height: 1.6em; font-family: Georgia, sans-serif; background: #F7F7F7; - color: #44444; + color: #444444; } section, footer, header, aside, nav{ @@ -70,7 +70,6 @@ h6 { --------------------------*/ #cover { - padding: 0 0 20px 0; float:left; width:100%; @@ -114,7 +113,6 @@ h6 { Link --------------------------*/ - a { color: #21759B; text-decoration: none; @@ -545,13 +543,13 @@ ul li, ol li{ .border #disqus_thread { padding-top: 1.2em; } + #disqus_thread { float: left; font-family: Georgia,Times,Cambria,serif; width: 100%; } - /*------------------------- Sidebar --------------------------*/ @@ -562,7 +560,7 @@ ul li, ol li{ height:100%; width: 200px; font-size:15px; - line-height: 1.5; + line-height: 1.4; } #sidebar h2, #sidebar h3, #sidebar h4 { @@ -579,13 +577,17 @@ ul li, ol li{ } #sidebar .archivegroup ul.month { - margin-left:1.3em; + margin: 0.25em 0 0.25em 1.3em; } #sidebar .archivegroup ul.month li { margin:0; } +.archivegroup li.expanded, .archivegroup li.collapsed { + margin:0; +} + .about, .social, .archive, .comments, .tagcloud { margin-bottom:2em; }