Author: sevein
Date: Wed Apr 4 15:35:11 2012
New Revision: 11374
Log:
Merge some templates from Dominion to main app, move libs to main vendor
directory
Added:
branches/2.0/vendor/chosen/
- copied from r11369, branches/2.0/plugins/qtDominionPlugin/vendor/chosen/
branches/2.0/vendor/html5.js
- copied unchanged from r11369,
branches/2.0/plugins/qtDominionPlugin/vendor/html5.js
branches/2.0/vendor/jquery.textfill.js
- copied unchanged from r11369,
branches/2.0/plugins/qtDominionPlugin/vendor/jquery.textfill.js
Deleted:
branches/2.0/plugins/qtDominionPlugin/templates/
branches/2.0/plugins/qtDominionPlugin/vendor/chosen/
branches/2.0/plugins/qtDominionPlugin/vendor/html5.js
branches/2.0/plugins/qtDominionPlugin/vendor/jquery.textfill.js
Modified:
branches/2.0/apps/qubit/templates/_header.php
branches/2.0/apps/qubit/templates/layout.php
Modified: branches/2.0/apps/qubit/templates/_header.php
==============================================================================
--- branches/2.0/apps/qubit/templates/_header.php Wed Apr 4 15:09:43
2012 (r11373)
+++ branches/2.0/apps/qubit/templates/_header.php Wed Apr 4 15:35:11
2012 (r11374)
@@ -1,38 +1,53 @@
<div id="header">
- <div class="section clearfix">
- <?php echo get_component('i18n', 'changeLanguageList') ?>
+ <div class="container">
- <?php echo get_component('menu', 'quickLinks') ?>
+ <div class="row">
- <?php if (sfConfig::get('app_toggleLogo')): ?>
- <?php echo link_to(image_tag('logo', array('alt' => __('Home'))),
'@homepage', array('id' => 'logo', 'rel' => 'home', 'title' => __('Home'))) ?>
- <?php endif; ?>
+ <div class="span12">
- <?php if (sfConfig::get('app_toggleTitle') ||
sfConfig::get('app_toggleDescription')): ?>
- <div id="name-and-slogan">
+ <a id="header-council" href="http://www.archivescanada.ca";><?php echo
image_tag('/plugins/qtDominionPlugin/images/council.png', array('width' =>
'156', 'height' => '42')) ?></a>
- <?php if (sfConfig::get('app_toggleTitle')): ?>
- <h1 id="site-name">
- <?php echo
link_to('<span>'.sfConfig::get('app_siteTitle').'</span>', '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?>
- </h1>
- <?php endif; ?>
+ <ul id="header-nav" class="nav nav-pills">
- <?php if (sfConfig::get('app_toggleDescription')): ?>
- <div id="site-slogan">
- <?php echo sfConfig::get('app_siteDescription') ?>
- </div>
- <?php endif; ?>
+ <li><?php echo link_to(__('Home'), '@homepage') ?></li>
+ <li><?php echo link_to(__('Sitemap'), array('module' =>
'staticpage', 'slug' => 'sitemap')) ?></li>
+ <li><?php echo link_to(__('Contact us'), array('module' =>
'staticpage', 'slug' => 'contact')) ?></li>
- </div> <!-- /#name-and-slogan -->
+ <?php foreach (array('en', 'fr') as $item): ?>
+ <?php if ($sf_user->getCulture() != $item): ?>
+ <li><?php echo link_to(format_language($item, $item),
array('sf_culture' => $item) + $sf_request->getParameterHolder()->getAll())
?></li>
+ <?php break; ?>
+ <?php endif; ?>
+ <?php endforeach; ?>
- <?php endif; ?>
+ <?php // echo get_component('i18n', 'changeLanguageList') ?>
- <?php echo get_component_slot('header') ?>
+ <?php // echo get_component('menu', 'quickLinks') ?>
- </div> <!-- /.section -->
-</div> <!-- /#header -->
+ <?php // echo get_component('menu', 'browseMenu',
array('sf_cache_key' => $sf_user->getCulture().$sf_user->getUserID())) ?>
-<?php echo get_component('search', 'box') ?>
+ <?php // echo get_component_slot('header') ?>
-<?php echo get_component('menu', 'browseMenu', array('sf_cache_key' =>
$sf_user->getCulture().$sf_user->getUserID())) ?>
+ </ul>
+
+ </div>
+
+ </div>
+
+ <div class="row">
+
+ <?php // Restore old snippet (settings: app_toggleLogo, app_toggleTitle,
app_toggleDescription, app_sitleTitle, app_sitleDescription)
+ <div id="logo-and-name" class="span6">
+ <h1><?php echo link_to(image_tag('logo'), '@homepage', array('rel' =>
'home', 'title' => __('Home'))) ?></h1>
+ </div>
+
+ <div id="header-search" class="span6">
+ <?php echo get_component('search', 'box') ?>
+ </div>
+
+ </div>
+
+ </div>
+
+</div>
Modified: branches/2.0/apps/qubit/templates/layout.php
==============================================================================
--- branches/2.0/apps/qubit/templates/layout.php Wed Apr 4 15:09:43
2012 (r11373)
+++ branches/2.0/apps/qubit/templates/layout.php Wed Apr 4 15:35:11
2012 (r11374)
@@ -1,5 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="<?php echo
$sf_user->getCulture() ?>"<?php if ('rtl' ==
sfCultureInfo::getInstance($sf_user->getCulture())->direction): ?>
dir="rtl"<?php endif; ?>>
+<!DOCTYPE html>
+<html lang="<?php echo $sf_user->getCulture() ?>"<?php if ('rtl' ==
sfCultureInfo::getInstance($sf_user->getCulture())->direction): ?>
dir="rtl"<?php endif; ?>>
<head>
<?php include_http_metas() ?>
<?php include_metas() ?>
@@ -8,49 +8,28 @@
<?php include_stylesheets() ?>
<?php include_javascripts() ?>
</head>
- <body class="yui-skin-sam <?php echo $sf_context->getModuleName() ?> <?php
echo $sf_context->getActionName() ?>">
- <div id="page-wrapper">
- <div id="page">
+ <body class="<?php echo $sf_context->getModuleName() ?> <?php echo
$sf_context->getActionName() ?>">
- <div id="update-check">
- <?php echo get_component('default', 'updateCheck') ?>
- </div>
+ <div id="update-check">
+ <?php echo get_component('default', 'updateCheck') ?>
+ </div>
- <?php echo get_partial('header') ?>
+ <div id="print-date">
+ <?php echo __('Printed: %d%', array('%d%' => date('Y-m-d'))) ?>
+ </div>
- <?php if ($sf_user->isAuthenticated()): ?>
- <div id="navigation">
- <div class="section">
- <?php echo get_component('menu', 'mainMenu',
array('sf_cache_key' => $sf_user->getCulture().$sf_user->getUserID())) ?>
- </div> <!-- /.section -->
- </div> <!-- /#navigation -->
- <?php endif; ?>
+ <?php echo get_partial('header') ?>
- <div id="main-wrapper">
- <div class="clearfix" id="main">
+ <div id="wrapper" class="container">
- <div class="column" id="content">
- <?php if ($sf_context->getModuleName() != 'sfInstallPlugin'): ?>
- <div id="print-date">
- <?php echo __('Printed: %d%', array('%d%' => date('Y-m-d')))
?>
- </div>
- <?php endif; ?>
+ <?php // echo get_partial('sidebar') ?>
- <div class="section">
- <?php echo $sf_content ?>
- </div> <!-- /.section -->
- </div> <!-- /.column#content -->
+ <?php echo $sf_content ?>
- <?php echo get_partial('sidebar') ?>
+ <?php echo get_partial('footer') ?>
- </div> <!-- /#main -->
- </div> <!-- /#main-wrapper -->
-
- <?php echo get_partial('footer') ?>
-
- </div> <!-- /#page -->
- </div> <!-- /#page-wrapper -->
+ </div>
</body>
</html>
Copied: branches/2.0/vendor/html5.js (from r11369,
branches/2.0/plugins/qtDominionPlugin/vendor/html5.js)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2.0/vendor/html5.js Wed Apr 4 15:35:11 2012
(r11374, copy of r11369, branches/2.0/plugins/qtDominionPlugin/vendor/html5.js)
@@ -0,0 +1,3 @@
+/*! HTML5 Shiv pre3.5 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+ Uncompressed source: https://github.com/aFarkas/html5shiv */
+(function(a,b){function h(a,b){var
c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return
c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function
i(){var a=l.elements;return typeof a=="string"?a.split(" "):a}function
j(a){var
b={},c=a.createElement,f=a.createDocumentFragment,g=f();a.createElement=function(a){l.shivMethods||c(a);var
f;return
b[a]?f=b[a].cloneNode():e.test(a)?f=(b[a]=c(a)).cloneNode():f=c(a),f.canHaveChildren&&!d.test(a)?g.appendChild(f):f},a.createDocumentFragment=Function("h,f","return
function(){var
n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+i().join().replace(/\w+/g,function(a){return
b[a]=c(a),g.createElement(a),'c("'+a+'")'})+");return n}")(l,g)}function
k(a){var b;return
a.documentShived?a:(l.shivCSS&&!f&&(b=!!h(a,"article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio{display:none}canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden]{
display:none}audio[controls]{display:inline-block;*display:inline;*zoom:1}mark{background:#FF0;color:#000}")),g||(b=!j(a)),b&&(a.documentShived=b),a)}function
p(a){var
b,c=a.getElementsByTagName("*"),d=c.length,e=RegExp("^(?:"+i().join("|")+")$","i"),f=[];while(d--)b=c[d],e.test(b.nodeName)&&f.push(b.applyElement(q(b)));return
f}function q(a){var
b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(n+":"+a.nodeName);while(d--)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return
e.style.cssText=a.style.cssText,e}function r(a){var
b,c=a.split("{"),d=c.length,e=RegExp("(^|[\\s,>+~])("+i().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),f="$1"+n+"\\:$2";while(d--)b=c[d]=c[d].split("}"),b[b.length-1]=b[b.length-1].replace(e,f),c[d]=b.join("}");return
c.join("{")}function s(a){var b=a.length;while(b--)a[b].removeNode()}function
t(a){var b,c,d=a.namespaces,e=a.parentWindow;return!o||a.printShived?a:(typeof
d[n]=="undefined"&&d.add(n),e.attachEvent("onbeforeprint",functio
n(){var
d,e,f,g=a.styleSheets,i=[],j=g.length,k=Array(j);while(j--)k[j]=g[j];while(f=k.pop())if(!f.disabled&&m.test(f.media)){for(d=f.imports,j=0,e=d.length;j<e;j++)k.push(d[j]);try{i.push(f.cssText)}catch(l){}}i=r(i.reverse().join("")),c=p(a),b=h(a,i)}),e.attachEvent("onafterprint",function(){s(c),b.removeNode(!0)}),a.printShived=!0,a)}var
c=a.html5||{},d=/^<|^(?:button|form|map|select|textarea|object|iframe)$/i,e=/^<|^(?:a|b|button|code|div|fieldset|form|h1|h2|h3|h4|h5|h6|i|iframe|img|input|label|li|link|ol|option|p|param|q|script|select|span|strong|style|table|tbody|td|textarea|tfoot|th|thead|tr|ul)$/i,f,g;(function(){var
c=b.createElement("a");c.innerHTML="<xyz></xyz>",f="hidden"in c,f&&typeof
injectElementWithStyles=="function"&&injectElementWithStyles("#modernizr{}",function(b){b.hidden=!0,f=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle).display=="none"}),g=c.childNodes.length==1||function(){try{b.createElement("a")}catch(a){return!0}var
c=b.createDocumen
tFragment();return typeof c.cloneNode=="undefined"||typeof
c.createDocumentFragment=="undefined"||typeof
c.createElement=="undefined"}()})();var l={elements:c.elements||"abbr article
aside audio bdi canvas data datalist details figcaption figure footer header
hgroup mark meter nav output progress section summary time
video",shivCSS:c.shivCSS!==!1,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:k};a.html5=l,k(b);var
m=/^$|\b(?:all|print)\b/,n="html5shiv",o=!g&&function(){var
c=b.documentElement;return typeof b.namespaces!="undefined"&&typeof
b.parentWindow!="undefined"&&typeof c.applyElement!="undefined"&&typeof
c.removeNode!="undefined"&&typeof a.attachEvent!="undefined"}();l.type+="
print",l.shivPrint=t,t(b)})(this,document)
\ No newline at end of file
Copied: branches/2.0/vendor/jquery.textfill.js (from r11369,
branches/2.0/plugins/qtDominionPlugin/vendor/jquery.textfill.js)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2.0/vendor/jquery.textfill.js Wed Apr 4 15:35:11 2012
(r11374, copy of r11369,
branches/2.0/plugins/qtDominionPlugin/vendor/jquery.textfill.js)
@@ -0,0 +1,14 @@
+/*
+ textfill
+ @name jquery.textfill.js
+ @author Russ Painter
+ @author Yu-Jie Lin
+ @version 0.1.2
+ @date 01-29-2012
+ @copyright (c) 2012 Yu-Jie Lin
+ @copyright (c) 2009 Russ Painter
+ @license MIT License
+ @homepage https://github.com/jquery-textfill/jquery-textfill
+ @example http://jquery-textfill.github.com/jquery-textfill/Example.htm
+*/
+(function(a){a.fn.textfill=function(g){var
c=jQuery.extend({maxFontPixels:40,minFontPixels:4,innerTag:"span"},g);return
this.each(function(){for(var
d=a(c.innerTag+":visible:first",this),h=a(this).height(),i=a(this).width(),b,e=c.minFontPixels,f=c.maxFontPixels;b=Math.floor(e+f)/2,e<=f;){d.css("font-size",b);if(d.height()<h&&d.width()<i)e=b+1;else
f=b-1}})}})(jQuery);
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
