Updated 2k11 to v1.0.9.

This commit is contained in:
Matthias Mees 2012-01-30 01:39:04 +01:00
parent 503c170ede
commit e2c95b3904
5 changed files with 32 additions and 22 deletions

View File

@ -10,15 +10,19 @@ function serendipity_smarty_html5time($timestamp) { return date("c", $timestamp)
$serendipity['smarty']->register_modifier('serendipity_smarty_html5time', 'serendipity_smarty_html5time');
if (class_exists('serendipity_event_spamblock')) {
$required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%spamblock%required_fields'", true, 'assoc');
$required_fields = explode(',', $required_fieldlist['value']);
$smarty_required_fields = array();
foreach($required_fields AS $required_field) {
$required_field = trim($required_field);
if (empty($required_field)) continue;
$smarty_required_fields[$required_field] = $required_field;
}
$serendipity['smarty']->assign('required_fields', $smarty_required_fields);
$required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%spamblock%required_fields'", true, 'assoc');
} elseif (class_exists('serendipity_event_commentspice')) {
$required_fieldlist = serendipity_db_query("SELECT value FROM {$serendipity['dbPrefix']}config WHERE name LIKE '%commentspice%required_fields'", true, 'assoc');
}
if (is_array($required_fieldlist)) {
$required_fields = explode(',', $required_fieldlist['value']);
$smarty_required_fields = array();
foreach($required_fields AS $required_field) {
$required_field = trim($required_field);
if (empty($required_field)) continue;
$smarty_required_fields[$required_field] = $required_field;
}
$serendipity['smarty']->assign('required_fields', $smarty_required_fields);
}
$template_config = array(

View File

@ -1,4 +1,4 @@
Name: 2k11
Author: Matthias Mees, Veit Lehmann
Date: 2012-01-28
Date: 2012-01-30
Require Serendipity: 1.6

View File

@ -1,4 +1,4 @@
//https://github.com/scottjehl/iOS-Orientationchange-Fix
// https://github.com/scottjehl/iOS-Orientationchange-Fix
(function(m){var l=m.document;if(!l.querySelector){return}var n=l.querySelector("meta[name=viewport]"),a=n&&n.getAttribute("content"),k=a+",maximum-scale=1",d=a+",maximum-scale=10",g=true,j,i,h,c;if(!n){return}function f(){n.setAttribute("content",d);g=true}function b(){n.setAttribute("content",k);g=false}function e(o){c=o.accelerationIncludingGravity;j=Math.abs(c.x);i=Math.abs(c.y);h=Math.abs(c.z);if(!m.orientation&&(j>7||((h>6&&i<8||h<8&&i>6)&&j>5))){if(g){b()}}else{if(!g){f()}}}m.addEventListener("orientationchange",f,false);m.addEventListener("devicemotion",e,false)})(this);
// https://github.com/davatron5000/FitVids.js
(function(a){a.fn.fitVids=function(b){var c={customSelector:null};var e=document.createElement("div"),d=document.getElementsByTagName("base")[0]||document.getElementsByTagName("script")[0];e.className="fit-vids-style";e.innerHTML="&shy;<style> .fluid-width-video-wrapper { width: 100%; position: relative; padding: 0; } .fluid-width-video-wrapper iframe, .fluid-width-video-wrapper object, .fluid-width-video-wrapper embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } </style>";d.parentNode.insertBefore(e,d);if(b){a.extend(c,b)}return this.each(function(){var f=["iframe[src^='http://player.vimeo.com']","iframe[src^='http://www.youtube.com']","iframe[src^='http://www.kickstarter.com']","object","embed"];if(c.customSelector){f.push(c.customSelector)}var g=a(this).find(f.join(","));g.each(function(){var k=a(this);if(this.tagName.toLowerCase()=="embed"&&k.parent("object").length||k.parent(".fluid-width-video-wrapper").length){return}var h=this.tagName.toLowerCase()=="object"?k.attr("height"):k.height(),i=h/k.width();if(!k.attr("id")){var j="fitvid"+Math.floor(Math.random()*999999);k.attr("id",j)}k.wrap('<div class="fluid-width-video-wrapper"></div>').parent(".fluid-width-video-wrapper").css("padding-top",(i*100)+"%");k.removeAttr("height").removeAttr("width")})})}})(jQuery);
@ -16,9 +16,6 @@ jQuery(document).ready(function($) {
var $select = $('<select/>');
$('#primary-nav li').each(function(){var $el=$(this);if($el.find('span').length){$('<option/>',{'selected':'selected','value':'','text':$el.text()}).appendTo($select);}else{$('<option/>',{'value':$el.find('a').attr('href'),'text':$el.text()}).appendTo($select);}});
if($select.children().size()>0){$select.appendTo('#primary-nav').change(function(){window.location=$(this).find('option:selected').val();});}
// Replace entrypaging icons
$('.serendipity_entrypaging_left .epicon').text('←');
$('.serendipity_entrypaging_right .epicon').text('→');
// Fit embedded videos
$('#content>article').fitVids();
// placeholder polyfill

View File

@ -33,7 +33,7 @@
</script>
<style type="text/css">#serendipity_preview_spacer {ldelim}float:none!important;height:0!important;{rdelim}</style>
</head>
<body>
<body{if $template_option.webfonts != 'none'} class="{$template_option.webfonts}"{/if}>
<div id="page" class="clearfix container">
<div id="main" class="clearfix{if $leftSidebarElements > 0 && $rightSidebarElements > 0} col3{elseif $leftSidebarElements > 0 && $rightSidebarElements == 0} col2l{else} col2r{/if}">
<div id="content" class="clearfix" style="padding: 1em 0; margin: 0;">

View File

@ -533,7 +533,8 @@ pre .geshi {
#c,
.serendipity_commentDirection {
background: #eee;
border: 1px solid #aaa;
border: 1px solid #ddd;
color: #aaa;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@ -599,20 +600,26 @@ pre .geshi {
.serendipity_msg_important,
.serendipity_msg_notice {
color: #fff;
font-size: .8125em;
line-height: 1.8462;
max-width: 35em;
padding: .3846em;
text-shadow: 1px 1px 1px rgba(0,0,0,.8);
text-shadow: 0 1px 0 rgba(255,255,255,.5);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.serendipity_msg_important { background: #800; }
.serendipity_msg_important {
background: #f2dede;
border: 1px solid #eed3d7;
color: #b94a48;
}
.serendipity_msg_notice { background: #080; }
.serendipity_msg_notice {
background: #dff0d8;
border: 1px solid #d6e9c6;
color: #468847;
}
.serendipity_image_left,
.serendipity_image_right,
@ -728,13 +735,15 @@ pre .geshi {
text-align: right;
}
.serendipity_entrypaging>.epicon { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
.epicon { display: none; visibility: hidden; }
.serendipity_entrypaging_left,
.serendipity_entrypaging_right { display: block; }
.serendipity_entrypaging_left { text-align: left; }
.serendipity_entrypaging_left:before { content: "← "; }
.serendipity_entrypaging_right { text-align: right; }
.serendipity_entrypaging_right:after { content: " →"; }
/* Helper classes */
.visuallyhidden { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }