Commit 25122186 authored by shammash's avatar shammash Committed by lechuck
Browse files

updated constructor to 1.6.4

parent a4593bc6
......@@ -7,20 +7,11 @@
<?php get_header(); ?>
<div id="content" class="box shadow opacity <?php the_constructor_layout_class() ?>">
<div id="container" >
<div id="posts">
<div <?php post_class(); ?>>
<div class="title opacity box">
<h1 class="center"><a href="#" title="<?php _e('Error 404 - Not Found', 'constructor'); ?>"><?php _e('Error 404 - Not Found', 'constructor'); ?></a></h1>
</div>
<div class="entry">
<p class="center"><?php _e('Sorry, but you are looking for something that isn&#8217;t here.', 'constructor'); ?></p>
<article <?php post_class(); ?>>
<h1 class="opacity box center"><a href="#" title="<?php _e('Error 404 - Not Found', 'constructor'); ?>"><?php _e('Error 404 - Not Found', 'constructor'); ?></a></h1>
<p><?php _e('Sorry, but you are looking for something that isn&#8217;t here.', 'constructor'); ?></p>
<p><?php get_search_form() ?></p>
</div>
<div class="footer">
<div class="line"></div>
</div>
</div>
</div>
</article>
</div><!-- id='container' -->
<script type="text/javascript">
// focus on search field after it has loaded
......
......@@ -33,55 +33,6 @@ $constructor_modules = array(
require_once CONSTRUCTOR_DIRECTORY .'/libs/Constructor/Admin.php';
/**
* Replace scandir()
*
* @category PHP
* @package PHP_Compat
* @link http://php.net/function.scandir
* @author Aidan Lister <aidan@php.net>
* @version $Revision: 1.18 $
* @since PHP 5
* @require PHP 4.0.0 (user_error)
*/
if (!function_exists('scandir')) {
function scandir($directory, $sorting_order = 0)
{
if (!is_string($directory)) {
user_error('scandir() expects parameter 1 to be string, ' .
gettype($directory) . ' given', E_USER_WARNING);
return;
}
if (!is_int($sorting_order) && !is_bool($sorting_order)) {
user_error('scandir() expects parameter 2 to be long, ' .
gettype($sorting_order) . ' given', E_USER_WARNING);
return;
}
if (!is_dir($directory) || (false === $fh = @opendir($directory))) {
user_error('scandir() failed to open dir: Invalid argument', E_USER_WARNING);
return false;
}
$files = array ();
while (false !== ($filename = readdir($fh))) {
$files[] = $filename;
}
closedir($fh);
if ($sorting_order == 1) {
rsort($files);
} else {
sort($files);
}
return $files;
}
}
$admin = new Constructor_Admin();
$admin -> init($constructor_modules);
......@@ -7,18 +7,24 @@
* @todo More flexible
*/
return array(
'Aclonica',
//'Allan',// 700 weight
'Allerta',
'"Allerta Stencil"',
'Amaranth',
'"Annie Use Your Telescope"',
'"Anonymous Pro"',
'Anton',
'"Architects Daughter"',
'Arimo', // Regular / Italic / Bold / Bold Italic
'Arvo', // Regular / Italic / Bold / Bold Italic
'Artifika',
'Asset',
'Astloch',
'Bentham',
'Bevan',
'"Bigshot One"',
'Brawler',
//'Buda', // 300 weight
'Cabin',
//'"Cabin Sketch"',// 700 weight
......@@ -26,6 +32,9 @@ return array(
'Candal',
'Cantarell', // Regular / Italic / Bold / Bold Italic
'Cardo',
'"Carter One"',
'Caudex',
'"Cedarville Cursive"',
'"Cherry Cream Soda"',
'Chewy',
//'Coda',// 800 weight
......@@ -37,16 +46,24 @@ return array(
'"Crimson Text"',
'Crushed',
'Cuprum',
'Damion',
'"Dancing Script"',
'"Dawning of a New Day"',
'"Didact Gothic"',
'"Droid Sans"', // Regular / Bold
'"Droid Sans Mono"',
'"Droid Serif"',
'"EB Garamond"',
'"Expletus Sans"',
'"Fontdiner Swanky"',
'"Francois One"',
'Geo',
'"Goblin One"',
'"Goudy Bookletter 1911"',
'"Gravitas One"',
'Gruppo',
'"Hammersmith One"',
'"Holtwood One SC"',
'"Homemade Apple"',
// "IM Fell" family
'"IM Fell English"',
......@@ -56,57 +73,106 @@ return array(
'"Irish Grover"',
'"Josefin Sans"',
'"Josefin Slab"',
'Judson',
'Jura',
'"Just Another Hand"',
'"Just Me Again Down Here"',
'Kameron',
'Kenia',
'Kranky',
'Kreon',
'Kristi',
'"La Belle Aurore"',
'Lato',
'"League Script"',
'Lekton',
'Limelight',
'Lobster',
'"Lobster Two"',
'Lora',
'"Luckiest Guy"',
'Mako',
'"Maven Pro"',
'Meddon',
'MedievalSharp',
'Megrim',
'Merriweather',
'Metrophobic',
'Michroma',
'Miltonian',
'"Miltonian Tattoo"',
'Molengo',
'Monofett',
'"Mountains of Christmas"',
'Muli',
'Neucha',
'Neuton',
'"News Cycle"',
'Nobile',
//'Nova', // 100 weight
'"Nova Square"',
'"Nova Oval"',
'"Nova Cut"',
'"Nova Round"',
'"Nova Script"',
'"Nova Mono"',
'Nunito',
'"OFL Sorts Mill Goudy TT"',
'"Old Standard TT"',
'Orbitron',
'Oswald',
'"PT Sans"',
'"PT Serif"',
'"Over the Rainbow"',
'Pacifico',
'"Paytone One"',
'"Permanent Marker"',
'Philosopher',
'Play',
'"Playfair Display"',
'Podkova',
'"PT Sans"',
'"PT Serif"',
'Puritan',
'Quattrocento',
'"Quattrocento Sans"',
'Radley',
//'Raleway', // 100 weight
'Redressed',
'"Reenie Beanie"',
'"Rock Salt"',
'Rokkitt',
'"Ruslan Display"',
'Schoolbell',
'"Shadows Into Light"',
'Shanti',
'"Sigmar One"',
'"Six Caps"',
'Slackey',
'Smythe',
//'Sniglet', // 800 weight
'"Special Elite"',
'"Sue Ellen Francisco"',
'Sunshiney',
'Syncopate',
'"Swanky and Moo Moo"',
'Tangerine',
'"Tenor Sans"',
'"Terminal Dosis Light"',
'"The Girl Next Door"',
'Tinos',
'Ubuntu',
'Ultra',
//'UnifrakturCook', // 700 weight
'UnifrakturMaguntia',
'Unkempt',
'VT323',
'Varela',
'Vibur',
'Vollkorn',
'VT323',
'"Waiting for the Sunrise"',
'"Walter Turncoat"',
'Wallpoet',
'"Wire One"',
'"Yanone Kaffeesatz"',
'Zeyada'
);
?>
\ No newline at end of file
......@@ -46,19 +46,24 @@ $css_file = $theme_path .'/style.css';
font-size:1.2em;
}</pre>
<?php _e('Sidebar', 'constructor');?>
<pre>.sidebar{
<pre>aside {
font-size:1.4em;
}</pre>
<?php _e('Content', 'constructor');?>
<pre>.hentry .title { /* post title */
<pre>.hentry header { /* post title */
border:0;
}
.hentry .entry { /* content */
font-size:1.6em
}
.hentry .footer { /* footer links */
.hentry footer { /* footer links */
color:#ccc /* it's gray color */
}
</pre>
<?php _e('Template', 'constructor');?>
<pre>.tile > div { /* fixed Tile layout width */
width:340px !important;
}
</pre>
</td>
</tr>
......
......@@ -76,6 +76,8 @@ function loadFont(font) {
</p>
</td>
<td rowspan="5" valign="top" class="updated quick-links" width="320px">
<h3><?php _e('Google Web Fonts', 'constructor') ?></h3>
<p><a href="http://www.google.com/webfonts"><?php _e('Google Web Fonts lets you browse all the fonts available via the Google Web Fonts API. All fonts in the directory are available for use on your website under an open source license and are served by Google servers.', 'constructor') ?></a></p>
<h3><?php _e('Font Weight', 'constructor') ?></h3>
<p><?php _e('Defines from thin to thick characters. 400 is the same as "normal", and 700 is the same as "bold"', 'constructor') ?>
</p>
......
......@@ -34,7 +34,10 @@ $layouts = array_filter($layouts, 'is_php');
<td valign="top" class="updated quick-links" width="240px">
<h3><?php _e('Help', 'constructor'); ?></h3>
<a href="http://code.google.com/p/wp-constructor/wiki/ConstructorLayouts" title="Create custom layout">Create custom layout</a>
<br/><br/>
<br/>
<strong><?php _e('Tile Template', 'constructor')?></strong>
<?php _e('Optimized for container with width equals to 1024px', 'constructor')?>
<br/>
<dl>
<dt><?php _e('Homepage', 'constructor')?></dt>
<dd>http://domain.com</dd>
......
......@@ -16,14 +16,11 @@ $author = get_the_author();
?>
<div id="content" class="box shadow opacity <?php the_constructor_layout_class() ?>">
<div id="container" >
<div id="posts">
<div <?php echo 'class="author hentry ' . join(' ', get_post_class($class, null)) . '"'; ?>>
<div class="title opacity box">
<h1>
<article <?php echo 'class="author hentry ' . join(' ', get_post_class($class, null)) . '"'; ?>>
<h1 class="opacity box">
<a href="#" rel="bookmark" title="<?php echo $author ?>"><?php echo $author; ?></a>
<a class="feed-icon right" href="<?php echo get_author_feed_link(get_the_author_meta('ID')) ?>" title="<?php _e("Author RSS Feed", 'constructor') ?>"><?php _e("RSS Feed", 'constructor') ?></a>
</h1>
</div>
<div class="entry opacity box">
<div class="wp-caption alignleft persona" style="width: 128px">
<?php echo get_avatar(get_the_author_meta('email'), 120)?>
......@@ -72,13 +69,11 @@ $author = get_the_author();
<?php endif; ?>
</dl>
</div>
</div>
</article>
<?php if (have_posts()) : ?>
<div <?php post_class(); ?>>
<div class="title opacity box">
<h2><a href="#" rel="bookmark" title="<?php echo $author ?>"><?php printf(__('Latest posts by %s', 'constructor'), get_the_author_meta('nickname')); ?></a></h2>
</div>
<div class="entry">
<article <?php post_class(); ?>>
<h2 class="opacity box"><a href="#" rel="bookmark" title="<?php echo $author ?>"><?php printf(__('Latest posts by %s', 'constructor'), get_the_author_meta('nickname')); ?></a></h2>
<p class="entry">
<ul>
<?php while (have_posts()) : the_post(); ?>
<li>
......@@ -86,17 +81,13 @@ $author = get_the_author();
</li>
<?php endwhile; ?>
</ul>
</div>
<div class="footer"></div>
</div>
</p>
</article>
<?php else: ?>
<div class="hentry">
<div class="title opacity box">
<h2><a href="#"><?php _e('No posts by this author.', 'constructor'); ?></a></h2>
</div>
</div>
<article class="hentry">
<h2 class="opacity box"><a href="#"><?php _e('No posts by this author.', 'constructor'); ?></a></h2>
</article>
<?php endif; ?>
</div>
<?php get_constructor_navigation(); ?>
</div><!-- id='container' -->
<?php get_constructor_sidebar(); ?>
......
= Versions history =
This is local copy of file https://code.google.com/p/wp-constructor/wiki/ConstructorHistory
== 1.6.4 ==
* Hotfix in default layout
== 1.6.3 ==
* Added Brazilian Portugese language
* Fixed "line end" for all style.css
== 1.6.2 ==
* Updated Google Web Fonts
* Small changes in column layout
* Added new subtheme - "Old Newspaper" (included to default)
* Updated translation catalog
* Updated Russian translation
* Fixed mistake in Italian (issue #166)
== 1.6.1 ==
* Fixed security issue with WP version
* New template for layout - "Three columns"
* Small changes in "Tile" template
* Replace HTML5 javascript
== 1.6.0 ==
* Implemented HTML5 tags: article, header, footer, section, aside
* Cleaned some tags and styles
* Removed scandir.php
* Added support Google Calendar Events Widget
== 1.5.11 ==
* Change logic of the_constructor_layout_class() and get_constructor_sidebar()
* Moved function scandir to separated file (be ready for WP 3.2)
== 1.5.10 ==
* Return PHP4 compatability
* Small changes in simple layout:
......
......@@ -6,14 +6,14 @@
?>
<?php if ( post_password_required() ) : ?>
<div id="comments">
<section id="comments">
<p class="nopassword"><?php _e('This post is password protected. Enter the password to view comments.', 'constructor'); ?></p>
</div>
</section>
<?php return; ?>
<?php endif; ?>
<div id="comments">
<section id="comments">
<?php if ( have_comments() ) : ?>
<h3><?php comments_number(__('No Responses', 'constructor'), __('One Response', 'constructor'), __('% Responses', 'constructor'));?> <?php printf(__('to &#8220;%s&#8221;', 'constructor'), the_title('', '', false)); ?></h3>
......@@ -21,10 +21,10 @@
<?php wp_list_comments('avatar_size='.get_constructor_avatar_size());?>
</ol>
<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>
<div class="navigation">
<nav class="navigation">
<div class="alignleft"><?php previous_comments_link() ?></div>
<div class="alignright"><?php next_comments_link() ?></div>
</div>
</nav>
<?php endif; ?>
<?php else: ?>
<?php if (!comments_open() && !is_page()) : ?>
......@@ -43,4 +43,4 @@
add_filter('comment_form_default_fields', 'constructor_comment_fields');
?>
<?php comment_form(); ?>
</div>
\ No newline at end of file
</section>
\ No newline at end of file
......@@ -770,25 +770,25 @@ fieldset{
}
/*/Author*/
/*Archive*/
#posts .archive table td{
.archive table td{
color:{$color_text2}
}
#posts .archive table a{
.archive table a{
padding:4px;
color:{$color_text}
}
#posts .archive table a:hover{
.archive table a:hover{
background-color: {$color2};
}
/*/Archive*/
/*Sidebar*/
.sidebar .current_page_item a,
.sidebar .current-cat a{
aside .current_page_item a,
aside .current-cat a{
font-weight:900;
border-color:{$color_text}
}
.sidebar .current_page_item li a,
.sidebar .current-cat li a{
aside .current_page_item li a,
aside .current-cat li a{
font-weight:500;
border-color:{$color_border}
}
......@@ -853,5 +853,28 @@ fieldset{
.wp-pagenavi a:hover, .wp-pagenavi span.current {
border-color:{$color_border2} !important;
}
/*/Plugins:wp-pagenavi*/
/*Widgets:Google Calendar Events*/
.gce-widget-grid .gce-calendar,
.gce-widget-grid .gce-calendar th,
.gce-widget-grid .gce-calendar td {
border: 1px solid {$color_border} !important;
}
.gce-widget-grid .gce-calendar .gce-today {
background-color: {$color_bg2} !important;
}
.gce-widget-grid .gce-calendar .gce-has-events {
color:{$color1} !important;
}
.gce-event-info {
color:{$color_text} !important;
border: 1px solid {$color_border} !important;
background-color: {$color_bg} !important;
}
.gce-event-info .gce-tooltip-event {
color:{$color1} !important;
background-color: {$color_bg} !important;
}
/*/Widgets:Google Calendar Events*/
CSS;
?>
\ No newline at end of file
......@@ -6,7 +6,7 @@
?>
</div><!-- id='wrapcontent' -->
<div id="wrapfooter" class="wrapper">
<div id="footer">
<footer id="footer">
<?php
// check active
if (is_active_sidebar('footer')
......@@ -37,7 +37,7 @@
<p class="clear copy">
<?php get_constructor_footer();?>
</p>
</div>
</footer>
</div>
</div>
<?php wp_footer(); ?>
......
......@@ -154,6 +154,7 @@ if (!is_admin()) {
* Preview filter
*
* @param string $content
* @return string
*/
function constructor_preview($content) {
$link = add_query_arg(array('preview' => 1, 'template' => get_template()), '?theme-constructor=css');
......@@ -251,7 +252,7 @@ if (!is_admin()) {
* get content widget
*
* @param integer $i post counter
* @return
* @return void
*/
function get_constructor_content_widget($i)
{
......@@ -275,6 +276,7 @@ if (!is_admin()) {
/**
* get avatar size
*
* @param integer $size
* @return string
*/
function get_constructor_avatar_size($size = 32)
......@@ -286,6 +288,9 @@ if (!is_admin()) {
/**
* get no image
*
* @param integer $width
* @param integer $height
* @param string $align
* @return string
*/
function get_constructor_noimage($width = 320, $height = 320, $align = 'none')
......
......@@ -9,6 +9,9 @@
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>" />
<title><?php wp_title('&raquo;', true, 'right'); ?> <?php bloginfo('name'); ?></title>
<!--[if lt IE 9]>
<script type="text/javascript" src="<?php echo CONSTRUCTOR_DIRECTORY_URI; ?>/js/html5.js"></script>
<![endif]-->
<link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="stylesheet" type="text/css" media="screen" href="<?php bloginfo('stylesheet_url'); ?>"/>
<link rel="stylesheet" type="text/css" media="print" href="<?php echo CONSTRUCTOR_DIRECTORY_URI; ?>/print.css" />
......@@ -21,7 +24,7 @@
<div id="body">
<div id="wrapheader" class="wrapper">
<div id="header">
<header id="header">
<?php get_constructor_menu() ?>
<div id="title">
<?php if (is_home() || is_front_page()) { ?>
......@@ -31,7 +34,7 @@
<?php } ?>
<div id="description"><?php bloginfo('description');?></div>
</div>
</div>
</header>
</div>
<div id="wrapcontent" class="wrapper">
......
// html5shiv @rem remysharp.com/html5-enabling-script
// iepp v1.6.2 @jon_neal iecss.com/print-protector
// Dual licensed under the MIT or GPL Version 2 licenses
/*@cc_on(function(a,b){function r(a){var b=-1;while(++b<f)a.createElement(e[b])}if(!(!window.attachEvent||!b.createStyleSheet||!function(){var a=document.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}())){a.iepp=a.iepp||{};var c=a.iepp,d=c.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",e=d.split("|"),f=e.length,g=new RegExp("(^|\\s)("+d+")","gi"),h=new RegExp("<(/*)("+d+")","gi"),i=/^\s*[\{\}]\s*$/,j=new RegExp("(^|[^\\n]*?\\s)("+d+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),k=b.createDocumentFragment(),l=b.documentElement,m=l.firstChild,n=b.createElement("body"),o=b.createElement("style"),p=/print|all/,q;c.getCSS=function(a,b){if(a+""===undefined)return"";var d=-1,e=a.length,f,g=[];while(++d<e){f=a[d];if(f.disabled)continue;b=f.media||b,p.test(b)&&g.push(c.getCSS(f.imports,b),f.cssText),b="all"}return g.join("")},c.parseCSS=function(a){var b=[],c;while((c=j.exec(a))!=null)b.push(((i.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(g,"$1.iepp_$2")+c[4]);return b.join("\n")},c.writeHTML=function(){var a=-1;q=q||b.body;while(++a<f){var c=b.getElementsByTagName(e[a]),d=c.length,g=-1;while(++g<d)c[g].className.indexOf("iepp_")<0&&(c[g].className+=" iepp_"+e[a])}k.appendChild(q),l.appendChild(n),n.className=q.className,n.id=q.id,n.innerHTML=q.innerHTML.replace(h,"<$1font")},c._beforePrint=function(){o.styleSheet.cssText=c.parseCSS(c.getCSS(b.styleSheets,"all")),c.writeHTML()},c.restoreHTML=function(){n.innerHTML="",l.removeChild(n),l.appendChild(q)},c._afterPrint=function(){c.restoreHTML(),o.styleSheet.cssText=""},r(b),r(k);if(c.disablePP)return;m.insertBefore(o,m.firstChild),o.media="print",o.className="iepp-printshim",a.attachEvent("onbeforeprint",c._beforePrint),a.attachEvent("onafterprint",c._afterPrint)}})(this,document);@*/
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment