Permalink
Browse files

Merge branch 'release-3.1.3'

  • Loading branch information...
2 parents 810a3fe + 693a856 commit ed0a28974bfa48ad7ed9c13b761f6146587ee07c @kabel kabel committed May 15, 2012
View
@@ -1 +1 @@
-3.1.2
+3.1.3
View
@@ -132,6 +132,7 @@ class UNL_WDNTemplates_Compressor
'content/css3_selector_failover' => array('ignore' => true),
'variations/ie' => array('ignore' => true),
'variations/touch' => array('ignore' => true),
+ 'variations/print' => array('ignore' => true),
);
protected $_supportedMediaWidths = array(
@@ -1,2 +1,3 @@
/ie.css
/touch.css
+/print.css
@@ -1,31 +0,0 @@
-#maincontent a {text-decoration:underline; word-wrap: break-word; color: #444;}
-a:after {content: " (" attr(href) ")" !important; display: inline !important; height: auto !important; width: auto !important; background: none !important;}
-body, #header {width: auto !important; margin: 0 !important; padding: 0 !important; color:#333; min-height:0;}
-#wdn_content_wrapper {margin: 0 !important; padding: 0 !important; box-shadow:none; border: none;}
-#wdn_wrapper {margin:0; padding: 0; box-shadow: none; border:none;}
-
-h1, h2, h3, h4, h5, h6 {font-weight: normal !important;}
-#maincontent {border-top:1px solid #aaa; margin-top: 10px; padding-top: 7px;}
-#maincontent ul {list-style: square; padding: 0 0 1.1em 30px;}
-#maincontent ol {padding: 0 0 1.1em 36px;}
-#maincontent dd {padding: 0 0 0 30px;}
-ul.wdn_tabs {display:none;}
-#maincontent div.wdn_tabs_content div {display:block !important;}
-
-#header #logo {margin: 0; padding: 0; font-size: 0; color: #FFF; height: 0; width: auto; display: inline; float: none;}
-#header #logo:before {content:url('../../images/logo-print.png'); display: block; font-size: 12px; margin-right: 10px; height: 55px; width: 70px; float: left;}
-#header #logo:after {display: none !important;}
-#wdn_institution_title {margin: 0; padding: 0; display: block; float: left; height: auto;
- font-size: 0.9em; line-height: 1.1em; font-family: "Lucida Grande",Verdana,Arial; text-transform: none;}
-#wdn_site_title {margin: 0; padding: 0; position: relative; top: -2px; overflow: initial; text-decoration: none;
- font-size: 1em; line-height: 1.2em; display: block; width: auto; font-family: "Lucida Grande",Verdana,Arial;}
-#wdn_site_title span {display:none;}
-#pagetitle {margin: 0; padding: 0;}
-#pagetitle h1 {margin: 0; padding: 0; font-size: 1.3em; line-height: 1em; color: #666;}
-
-.skipnav, #wdn_identity_management, #wdn_search, #wdn_tool_links, #wdn_navigation_bar, #footer {display:none;}
-.noprint, .hidden {display:none;}
-.yesprint {display:block;}
-
-.ie #logo, .ie #header #logo:after, .ie .footer_col, .ie #wdn_copyright {display:none !important;}
-.ie #wdn_site_title {clear: left;}
@@ -72,7 +72,8 @@
}
img, video, audio, object {
- max-width:100%;
+ max-width:100%;
+ height: auto;
}
}
@@ -0,0 +1,176 @@
+/*
+*
+* !DO NOT EDIT THE CSS FILES, THEY ARE BUILT WITH THE LESS CSS!
+* less/variations/print.less
+*
+* ---------------------------
+* Styles associated with printing
+* ---------------------------
+*/
+@import "../_mixins/all.less";
+
+.hide() {
+ display: none !important;
+}
+.reset() {
+ margin: 0;
+ padding: 0;
+}
+
+.skipnav,
+#wdn_site_title span,
+#wdn_identity_management,
+#wdn_search,
+#wdn_tool_links,
+#wdn_navigation_bar,
+#footer {
+ .hide()
+}
+
+.noprint, .hidden {
+ .hide();
+}
+
+.yesprint {
+ display:block;
+}
+
+a:after {
+ content: " (" attr(href) ")" !important;
+ display: inline !important;
+ height: auto !important;
+ width: auto !important;
+ background: none !important;
+}
+
+html {
+ body {
+ .reset();
+ background: none;
+ color: #333;
+ }
+
+ #header {
+ .reset();
+ min-height: 0;
+ width: auto;
+ background: none;
+
+ #logo {
+ .reset();
+ font-size: 0;
+ color: #fff;
+ height: 0;
+ width: auto;
+ display: inline;
+ float: none;
+
+ &:before {
+ content: url('../../images/logo-print.png');
+ display: block;
+ font-size: 12px;
+ margin-right: 10px;
+ height: 55px;
+ width: 70px;
+ float: left;
+ }
+
+ &:after {
+ .hide();
+ }
+ }
+ }
+
+ #wdn_wrapper {
+ .reset();
+ box-shadow: none;
+ border:none;
+
+ #wdn_content_wrapper {
+ .reset();
+ box-shadow:none;
+ border: none;
+ }
+ }
+}
+
+#wdn_institution_title {
+ .reset();
+ display: block;
+ float: left;
+ height: auto;
+ font-size: 0.9em;
+ line-height: 1.1;
+ font-family: @impactFont;
+}
+
+#wdn_site_title {
+ .reset();
+ position: relative;
+ top: -2px;
+ overflow: initial;
+ text-decoration: none;
+ font-size: 1em;
+ line-height: 1.2;
+ display: block;
+ width: auto;
+ font-family: @impactFont;
+}
+
+#pagetitle {
+ .reset();
+
+ h1 {
+ .reset();
+ font-size: 1.3em;
+ line-height: 1;
+ color: #666;
+ }
+}
+
+#maincontent {
+ border-top: 1px solid #aaa;
+ margin-top: 10px;
+ padding-top: 7px;
+
+ a {
+ text-decoration:underline;
+ word-wrap: break-word;
+ color: #444;
+ }
+
+ ul {
+ list-style: square;
+ padding: 0 0 1.1em 30px;
+ }
+
+ ol {
+ padding: 0 0 1.1em 36px;
+ }
+
+ dd {
+ padding: 0 0 0 30px;
+ }
+
+ ul.wdn_tabs {
+ .hide();
+ }
+
+ div.wdn_tabs_content div {
+ display: block !important;
+ }
+}
+
+.ie {
+ #logo,
+ #header,
+ #logo:after,
+ .footer_col,
+ #wdn_copyright {
+ .hide();
+ }
+
+ #wdn_site_title {
+ clear: left;
+ }
+}
@@ -34,7 +34,7 @@ WDN.events = function() {
},
setup : function() {
- var localSettings = getLocalEventSettings();
+ var localSettings = getLocalEventSettings() || {};
if (!this.calURL) {
this.calURL = localSettings.href;
}
@@ -43,6 +43,10 @@ WDN.events = function() {
this.calTitle = localSettings.title || '';
}
+ if (localSettings.limit) {
+ this.limit = localSettings.limit;
+ }
+
if (WDN.jQuery(this.container).length != 0) {
WDN.jQuery(this.container).addClass('wdn_calendarDisplay');
WDN.loadCSS(WDN.getTemplateFilePath('css/content/events.css'));
@@ -23,7 +23,7 @@ WDN.feedback = function() {
},
commentSetup : function() {
if (WDN.hasDocumentClass('no-placeholder')) {
- WDN.loadJS(WDN.getTemplateFilePath('scripts/plugins/place/jquery.placeholder.min.js'), function() {
+ WDN.loadJS(WDN.getTemplateFilePath('scripts/plugins/placeholder/jquery.placeholder.min.js'), function() {
WDN.jQuery('#wdn_feedback_comments').find('[placeholder]').placeholder();
});
}

0 comments on commit ed0a289

Please sign in to comment.