Skip to content
Snippets Groups Projects
Commit 5ebd766b authored by Eric Rasmussen's avatar Eric Rasmussen
Browse files

[gh-253] Merging test into staging -c1200 -c1202 

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1298 20a16fea-79d4-4915-8869-1ea9d5ebf173
parent 3ac0a466
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 809 additions and 434 deletions
sites/all/themes/unl_digitalsignage/README.txt
+ 5
− 2
View file @ 5ebd766b
...@@ -4,14 +4,17 @@ Most recent version checked: ...@@ -4,14 +4,17 @@ Most recent version checked:
I haven't done a good enough job making the name references in the theme generic so you must use these: I haven't done a good enough job making the name references in the theme generic so you must use these:
Content type: digital_sign Content type machine name: digital_sign
Fields: Label/Name/Field/Widget Fields: Label/Name/Field/Widget
- Title - Title
- Videos/field_videosources/Text/Text field (Enter the ID of your mediahub channel(s). Enter <em>172</em> for http://mediahub.unl.edu/channels/172) - Videos/field_videosources/Text/Text field (Enter the address of the RSS feed for your mediahub channel(s), for example http://mediahub.unl.edu/channels/172?format=xml&limit=8)
- News/field_newssources/Text/Text field (Enter RSS feeds of your news sources. Could be a feed created by a View from your site, a feed of stories from newsroom.unl.edu that are properly tagged, etc.) - News/field_newssources/Text/Text field (Enter RSS feeds of your news sources. Could be a feed created by a View from your site, a feed of stories from newsroom.unl.edu that are properly tagged, etc.)
- Twitter/field_twitter/Text/Text field (Enter a public twitter username <em>UNLNews</em> or a public list <em>UNLNews/unl</em>. Do not enter the @ symbol or twitter.com.) - Twitter/field_twitter/Text/Text field (Enter a public twitter username <em>UNLNews</em> or a public list <em>UNLNews/unl</em>. Do not enter the @ symbol or twitter.com.)
- Photos/field_beautyshots/Image/Image Min 710x1080 (Use only high quality professional photos, no "snap shots".) - Photos/field_beautyshots/Image/Image Min 710x1080 (Use only high quality professional photos, no "snap shots".)
Blocks:
- On admin/structure/block for UNL DIGITAL SIGNAGE turn off all blocks except for "Main page content"
Things to make dev easier Things to make dev easier
- comment out overflow: hidden from html in style.css - comment out overflow: hidden from html in style.css
- change data_url in unl_digitalsignage_unlalert.js to a local copy for testing - change data_url in unl_digitalsignage_unlalert.js to a local copy for testing
......
sites/all/themes/unl_digitalsignage/css/1366.css 0 → 100644
+ 354
− 0
View file @ 5ebd766b
/* General page
*************/
html {
width: 1366px;
height: 768px;
overflow: hidden;
outline: 1px solid #eee;
}
body.node-type-digital-sign.front {
background: #FFF !important;
}
body.node-type-digital-sign {
background-color: gray;
background-image: url(../images/background-crosshatch.png);
color: #444;
}
body.node-type-digital-sign #breadcrumb {
display: none;
}
body.node-type-digital-sign #page-title {
display: inline-block;
margin-top: 12px;
margin-bottom: 20px;
padding: 12px 20px 0 92px;
font-family: 'URWGroteskCon-Lig';
font-size: 52px;
color: #FFF;
text-shadow: 1px 1px 4px #000;
border-radius: 0 10px 10px 0;
}
body.node-type-digital-sign .field {
z-index: 10;
position: relative;
}
body.node-type-digital-sign .field .field-label {
font-family: 'URWGroteskCon-Lig';
font-size: 45px;
letter-spacing: .04em;
}
/* Background image
****************/
#unl_digitalsignage_background {
z-index: -1;
position: absolute;
top: 0;
left: 0;
width: 1366px;
height: 768px;
background-image: url('../images/1366/background-lights.png');
}
/* Beauty Shots
*****************/
body.node-type-digital-sign .field-name-field-beautyshots {
z-index: -2;
position: absolute;
top: 0;
right: 0;
}
body.node-type-digital-sign .field-name-field-beautyshots .field-item {
position: absolute;
top: 0;
right: 0;
}
body.node-type-digital-sign .field-name-field-beautyshots .field-item img {
max-height: 768px;
}
/* Twitter
*****************/
body.node-type-digital-sign .field-name-field-twitter {
display: inline-block;
float: right;
width: 250px;
min-height: 125px;
padding: 14px 0 14px 14px;
margin: 14px 0 0 34px;
border-radius: 10px 0 0 60px / 10px 0 0 143px;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
background-color: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
}
body.node-type-digital-sign .field-name-field-twitter img {
float: left;
margin: 0 10px 12px 0;
height: 34px;
width: 34px;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-user {
float: left;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-user-name {
float: left;
margin-bottom: 4px;
font-size: 18px;
font-weight: bold;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-full-name {
float: left;
clear: left;
font-weight: normal;
font-size: 12px;
color: #999;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-text {
clear: left;
text-align: right;
font-size: 15px;
line-height: 1.2em;
padding-right: 15px;
word-wrap: break-word;
}
body.node-type-digital-sign .field-name-field-twitter .retweet {
float: right;
padding-right: 10px;
font-style: italic;
padding-top: 10px;
max-width: 200px;
font-size: 14px;
text-align: right;
}
/* News
*****************/
body.node-type-digital-sign .field-name-field-newssources {
clear: both;
margin: 0 0 0 23px;
}
body.node-type-digital-sign .field-name-field-newssources .field-items {
float: left;
background: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
}
body.node-type-digital-sign .field-name-field-newssources ul.field-items {
width: 363px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item {
clear: left;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
border-bottom: 1px solid black;
padding: 0;
min-height: 34px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item:last-child {
border: none;
}
body.node-type-digital-sign .field-name-field-newssources .field-item.show {
border-top: 1px solid #c9c9c9;
border-radius: 5px 0 0 5px;
width: 377px;
position: relative;
top: -1px;
left: -10px;
z-index: 11;
color: #222;
text-shadow: 0px 1px 0px white;
-webkit-box-shadow: 0px 1px 2px rgba(0,0,0, 0.5), inset 0 1px 2px #eee;
background-color: gray;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #C9C9C9), color-stop(1, #AFAFAF));
}
body.node-type-digital-sign .field-name-field-newssources .field-item.show:after {
content: ' ';
height: 0;
position: absolute;
right: -40px;
top: 0px;
width: 0;
border: 20px solid transparent;
border-left-color: #333;
/*border-left-image: url(border.png) 27 27 27 27 round round;*/
}
body.node-type-digital-sign .field-name-field-newssources .field-item.show h3 span {
padding: 0 0 0 40px;
font-size: 14px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item h3 {
font-size: 15px;
background-repeat: no-repeat;
padding: 5px 0 5px 5px;
background-origin: content-box;
height: 34px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item h3 span {
padding: 0 0 0 40px;
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
position: relative;
top: 10px;
min-height: 23px;
}
body.node-type-digital-sign .field-name-field-newssources .field-newssources-desc,
body.node-type-digital-sign .field-name-field-newssources .field-newssources-link,
body.node-type-digital-sign .field-name-field-newssources .field-newssources-qrcode {
display: none;
}
/* The actual div that shows the story
*********************/
.field-name-field-newssources .field-display {
float: left;
position: relative;
width: 528px;
height: 205px;
background-color: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
padding: 10px 10px 10px 20px;
margin-left: 14px;
font-size: 15px;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
border-radius: 0 10px 10px 0;
}
.field-name-field-newssources .field-display .desc {
line-height: 1.2em;
overflow: hidden;
max-height: 182px;
}
.field-name-field-newssources .field-display .desc * {
margin: 0;
padding: 0;
background: transparent !important;
}
.field-name-field-newssources .field-display .link {
position: absolute;
bottom: 5px;
right: 5px;
font-size: 20px;
}
.field-name-field-newssources .field-display .link:before {
content: '...continued at';
font-style: italic;
font-size: 16px;
padding-right: 12px;
}
.field-name-field-newssources .field-display .qrcode {
float: right;
margin-left: 7px;
}
/* Videos
*****************/
body.node-type-digital-sign .field-name-field-videosources {
margin: 0 0 0 23px;
}
body.node-type-digital-sign .field-name-field-videosources video {
height: 384px;
float: left;
margin-bottom: 26px;
}
body.node-type-digital-sign .field-name-field-videosources .field-videosources-desc {
background: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
padding: 10px 10px 10px 10px;
position: relative;
top: 20px;
max-height: 333px;
width: 235px;
overflow: hidden;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
font-size: 14px;
font-style: italic;
border-radius: 0 10px 10px 0;
opacity: 0.95;
line-height: 1.3em;
}
body.node-type-digital-sign .field-name-field-videosources .field-videosources-desc h3 {
font-size: 20px;
font-style: normal;
line-height: 1.1em;
margin-bottom: 14px;
}
body.node-type-digital-sign .field-name-field-videosources .field-videosources-desc p {
display: inline;
}
/* UNL Alert Box
*****************/
#unlalert-wrapper {
z-index: 9999999;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
text-align: center;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
font-size: 56px;
color: #111;
background: transparent;
}
#unlalert-wrapper div {
margin: 40px 0;
}
#unlalert-desc {
padding: 0 100px;
font-size: 110px;
}
#unlalert-bg-2 {
z-index: -1;
display: none;
position: fixed;
left: 0;
top: 0;
margin: 0 !important;
width: 100%;
height: 100%;
background-color:#d10000;
background-image: radial-gradient(55% 19%, ellipse closest-side, #d10000 9%,#750808 108%);
}
#unlalert-bg-1 {
z-index: -2;
position: fixed;
left: 0;
top: 0;
margin: 0 !important;
width: 100%;
height: 100%;
background-color: #fff;
}
sites/all/themes/unl_digitalsignage/css/1920.css 0 → 100644
+ 350
− 0
View file @ 5ebd766b
/* General page
*************/
html {
width: 1920px;
height: 1080px;
overflow: hidden;
}
body.node-type-digital-sign.front {
background: #FFF !important;
}
body.node-type-digital-sign {
background-color: gray;
background-image: url(../images/background-crosshatch.png);
color: #444;
}
body.node-type-digital-sign #breadcrumb {
display: none;
}
body.node-type-digital-sign #page-title {
display: inline-block;
margin-top: 24px;
margin-bottom: 20px;
padding: 14px 20px 0 122px;
font-family: 'URWGroteskCon-Lig';
font-size: 65px;
color: #FFF;
text-shadow: 2px 2px 4px #000;
border-radius: 0 10px 10px 0;
}
body.node-type-digital-sign .field {
z-index: 10;
position: relative;
}
body.node-type-digital-sign .field .field-label {
font-family: 'URWGroteskCon-Lig';
font-size: 45px;
letter-spacing: .04em;
}
/* Background image
****************/
#unl_digitalsignage_background {
z-index: -1;
position: absolute;
top: 0;
left: 0;
width: 1920px;
height: 1080px;
background-image: url('../images/background-lights.png');
}
/* Beauty Shots
*****************/
body.node-type-digital-sign .field-name-field-beautyshots {
z-index: -2;
position: absolute;
top: 0;
right: 0;
}
body.node-type-digital-sign .field-name-field-beautyshots .field-item {
position: absolute;
top: 0;
right: 0;
}
body.node-type-digital-sign .field-name-field-beautyshots .field-item img {
max-height: 1080px;
}
/* Twitter
*****************/
body.node-type-digital-sign .field-name-field-twitter {
display: inline-block;
float: right;
width: 350px;
min-height: 175px;
padding: 20px 0 20px 20px;
margin: 20px 0 0 50px;
border-radius: 10px 0 0 90px / 10px 0 0 163px;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
background-color: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
}
body.node-type-digital-sign .field-name-field-twitter img {
float: left;
margin: 0 10px 15px 0;
height: 48px;
width: 48px;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-user {
float: left;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-user-name {
float: left;
margin-bottom: 4px;
font-size: 25px;
font-weight: bold;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-full-name {
float: left;
clear: left;
font-weight: normal;
font-size: 16px;
color: #999;
}
body.node-type-digital-sign .field-name-field-twitter .tweet-text {
clear: left;
text-align: right;
font-size: 20px;
line-height: 1.2em;
padding-right: 20px;
word-wrap: break-word;
}
body.node-type-digital-sign .field-name-field-twitter .retweet {
float: right;
padding-right: 20px;
font-style: italic;
padding-top: 10px;
}
/* News
*****************/
body.node-type-digital-sign .field-name-field-newssources {
clear: both;
margin: 0 0 0 23px;
}
body.node-type-digital-sign .field-name-field-newssources .field-items {
float: left;
background: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
}
body.node-type-digital-sign .field-name-field-newssources ul.field-items {
width: 510px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item {
clear: left;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
border-bottom: 1px solid black;
padding: 0;
min-height: 42px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item:last-child {
border: none;
}
body.node-type-digital-sign .field-name-field-newssources .field-item.show {
border-top: 1px solid #c9c9c9;
border-radius: 5px 0 0 5px;
width: 530px;
position: relative;
top: -1px;
left: -10px;
z-index: 11;
color: #222;
text-shadow: 0px 1px 0px white;
-webkit-box-shadow: 0px 1px 2px rgba(0,0,0, 0.5), inset 0 1px 2px #eee;
background-color: gray;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.25, #C9C9C9), color-stop(1, #AFAFAF));
}
body.node-type-digital-sign .field-name-field-newssources .field-item.show:after {
content: ' ';
height: 0;
position: absolute;
right: -52px;
top: 0px;
width: 0;
border: 26px solid transparent;
border-left-color: #333;
/*border-left-image: url(border.png) 27 27 27 27 round round;*/
}
body.node-type-digital-sign .field-name-field-newssources .field-item.show h3 span {
padding: 0 0 0 52px;
font-size: 21px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item h3 {
font-size: 20px;
background-repeat: no-repeat;
padding: 5px 0 5px 5px;
background-origin: content-box;
height: 42px;
}
body.node-type-digital-sign .field-name-field-newssources .field-item h3 span {
padding: 0 0 0 45px;
display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
position: relative;
top: 10px;
min-height: 23px;
}
body.node-type-digital-sign .field-name-field-newssources .field-newssources-desc,
body.node-type-digital-sign .field-name-field-newssources .field-newssources-link,
body.node-type-digital-sign .field-name-field-newssources .field-newssources-qrcode {
display: none;
}
/* The actual div that shows the story
*********************/
.field-name-field-newssources .field-display {
float: left;
position: relative;
width: 742px;
height: 243px;
background-color: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
padding: 10px 10px 10px 20px;
margin-left: 20px;
font-size: 24px;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
border-radius: 0 10px 10px 0;
}
.field-name-field-newssources .field-display .desc {
line-height: 1.2em;
overflow: hidden;
max-height: 221px;
}
.field-name-field-newssources .field-display .desc * {
margin: 0;
padding: 0;
background: transparent !important;
}
.field-name-field-newssources .field-display .link {
position: absolute;
bottom: 5px;
right: 5px;
font-size: 20px;
}
.field-name-field-newssources .field-display .link:before {
content: '...continued at';
font-style: italic;
font-size: 16px;
padding-right: 12px;
}
.field-name-field-newssources .field-display .qrcode {
float: right;
margin-left: 10px;
}
/* Videos
*****************/
body.node-type-digital-sign .field-name-field-videosources {
margin: 0 0 0 23px;
}
body.node-type-digital-sign .field-name-field-videosources video {
height: 540px;
float: left;
margin-bottom: 45px;
}
body.node-type-digital-sign .field-name-field-videosources .field-videosources-desc {
background: rgba(255, 255, 255, 0.86);
background-image: -webkit-gradient(
linear,
right bottom,
left top,
color-stop(0.19, rgb(240,240,240)),
color-stop(0.6, rgb(222,222,222)),
color-stop(0.8, rgb(252,252,252))
);
padding: 10px 10px 10px 10px;
position: relative;
top: 20px;
max-height: 468px;
width: 330px;
overflow: hidden;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
font-size: 20px;
font-style: italic;
border-radius: 0 10px 10px 0;
opacity: 0.95;
line-height: 1.2em;
}
body.node-type-digital-sign .field-name-field-videosources .field-videosources-desc h3 {
font-size: 25px;
font-style: normal;
margin-bottom: 20px;
}
body.node-type-digital-sign .field-name-field-videosources .field-videosources-desc p {
display: inline;
}
/* UNL Alert Box
*****************/
#unlalert-wrapper {
z-index: 9999999;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
text-align: center;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
font-size: 70px;
color: #111;
background: transparent;
}
#unlalert-wrapper div {
margin: 40px 0;
}
#unlalert-desc {
padding: 0 100px;
font-size: 110px;
}
#unlalert-bg-2 {
z-index: -1;
display: none;
position: fixed;
left: 0;
top: 0;
margin: 0 !important;
width: 100%;
height: 100%;
background-color:#d10000;
background-image: radial-gradient(55% 19%, ellipse closest-side, #d10000 9%,#750808 108%);
}
#unlalert-bg-1 {
z-index: -2;
position: fixed;
left: 0;
top: 0;
margin: 0 !important;
width: 100%;
height: 100%;
background-color: #fff;
}
sites/all/themes/unl_digitalsignage/css/font.css 0 → 100644
+ 28
− 0
View file @ 5ebd766b
This diff is collapsed.
sites/all/themes/unl_digitalsignage/css/reset.css 0 → 100644
+ 48
− 0
View file @ 5ebd766b
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
\ No newline at end of file
sites/all/themes/unl_digitalsignage/css/style.css
+ 4
− 425
View file @ 5ebd766b
This diff is collapsed.
sites/all/themes/unl_digitalsignage/designfiles/display.png
+ 0
− 0
View replaced file @ 3ac0a466 View file @ 5ebd766b
sites/all/themes/unl_digitalsignage/designfiles/display.png

1.98 MiB | W: | H:

sites/all/themes/unl_digitalsignage/designfiles/display.png

2.19 MiB | W: | H:

sites/all/themes/unl_digitalsignage/designfiles/display.png
sites/all/themes/unl_digitalsignage/designfiles/display.png
sites/all/themes/unl_digitalsignage/designfiles/display.png
sites/all/themes/unl_digitalsignage/designfiles/display.png
  • 2-up
  • Swipe
  • Onion skin
sites/all/themes/unl_digitalsignage/designfiles/display1366x768.psd 0 → 100644
+ 0
− 0
View file @ 5ebd766b
File added
sites/all/themes/unl_digitalsignage/images/1366/background-lights.png 0 → 100644
+ 0
− 0
View file @ 5ebd766b
sites/all/themes/unl_digitalsignage/images/1366/background-lights.png

513 KiB

sites/all/themes/unl_digitalsignage/scripts/unl_digitalsignage.js
+ 18
− 6
View file @ 5ebd766b
UNL.digitalSignage = (function() { UNL.digitalSignage = (function() {
var width = 1920;
var height = 1080;
var maxItems = { var maxItems = {
'news' : 5, 'news' : 5,
'videos' : 10 'videos' : 10
...@@ -11,6 +13,11 @@ UNL.digitalSignage = (function() { ...@@ -11,6 +13,11 @@ UNL.digitalSignage = (function() {
init : function() { init : function() {
console.log('UNL.digitalSignage.init called'); console.log('UNL.digitalSignage.init called');
if ('1360' < window.innerWidth && window.innerWidth < '1372') {
width = 1366;
height = 768;
}
for (feed in UNL.digitalSignage.feeds) { for (feed in UNL.digitalSignage.feeds) {
if (UNL.digitalSignage.feeds.hasOwnProperty(feed)) { if (UNL.digitalSignage.feeds.hasOwnProperty(feed)) {
UNL.digitalSignage.setupFeed(feed); UNL.digitalSignage.setupFeed(feed);
...@@ -74,10 +81,15 @@ UNL.digitalSignage = (function() { ...@@ -74,10 +81,15 @@ UNL.digitalSignage = (function() {
'<div class="'+field+'-qrcode"></div>'+ '<div class="'+field+'-qrcode"></div>'+
'</li>'); '</li>');
var sizeSmall = 42, sizeBig = 120;
if (width < '1920') {
var sizeSmall = 32;
var sizeBig = 88;
}
// Small QR Code // Small QR Code
UNL.digitalSignage.addQrCode('.field-name-'+field+' .field-items .field-item:nth-child('+news.length+')', 'background-image', '42', val.link); UNL.digitalSignage.addQrCode('.field-name-'+field+' .field-items .field-item:nth-child('+news.length+')', 'background-image', sizeSmall, val.link);
// Big QR Code // Big QR Code
UNL.digitalSignage.addQrCode('.field-name-'+field+' .field-items .field-item:nth-child('+news.length+') .'+field+'-qrcode', 'img', '120', val.link); UNL.digitalSignage.addQrCode('.field-name-'+field+' .field-items .field-item:nth-child('+news.length+') .'+field+'-qrcode', 'img', sizeBig, val.link);
}); });
// Add the list of news stories // Add the list of news stories
...@@ -201,8 +213,8 @@ UNL.digitalSignage = (function() { ...@@ -201,8 +213,8 @@ UNL.digitalSignage = (function() {
// Show the next image // Show the next image
next.css({opacity: 0.0}).addClass('show'); next.css({opacity: 0.0}).addClass('show');
// Decide how to animate fading in the new image and whether to move the background // Decide how to animate fading in the new image and whether to move the background (the +/- 2 is just for a little fudging)
if (current.width() < '1920' && next.width() >= '1920') { if (current.width() < width+2 && next.width() >= width-2) {
next.animate({opacity: 1.0}, 3000, function() { next.animate({opacity: 1.0}, 3000, function() {
jQuery('#page-title').animate({ jQuery('#page-title').animate({
backgroundColor : 'rgba(255, 255, 255, 0.50)', backgroundColor : 'rgba(255, 255, 255, 0.50)',
...@@ -210,11 +222,11 @@ UNL.digitalSignage = (function() { ...@@ -210,11 +222,11 @@ UNL.digitalSignage = (function() {
color : 'rgba(60, 60, 60, 1.0)', color : 'rgba(60, 60, 60, 1.0)',
textShadow : '#FFFFFF 0 0 0' textShadow : '#FFFFFF 0 0 0'
}, 2000); }, 2000);
jQuery('#unl_digitalsignage_background').animate({'left' : '-1920px'}, 2000, function() { jQuery('#unl_digitalsignage_background').animate({'left' : '-'+width+'px'}, 2000, function() {
jQuery(opacityElements).css('background-image','none'); jQuery(opacityElements).css('background-image','none');
}); });
}); });
} else if (current.width() >= '1920' && next.width() < '1920') { } else if (current.width() >= width-2 && next.width() < width+2) {
jQuery('#page-title').animate({ jQuery('#page-title').animate({
backgroundColor : 'rgba(255, 255, 255, 0)', backgroundColor : 'rgba(255, 255, 255, 0)',
paddingLeft : pageTitle['padding-left'], paddingLeft : pageTitle['padding-left'],
......
sites/all/themes/unl_digitalsignage/template.php
+ 2
− 1
View file @ 5ebd766b
...@@ -58,7 +58,8 @@ function _unl_digitalsignage_twitterfeed($item, $fieldname) { ...@@ -58,7 +58,8 @@ function _unl_digitalsignage_twitterfeed($item, $fieldname) {
if (strpos($item, '/') === false) { if (strpos($item, '/') === false) {
$twitterapi = 'https://api.twitter.com/1/statuses/user_timeline.json?screen_name='.$item.'&include_rts=true&count=20&include_entities=true'; $twitterapi = 'https://api.twitter.com/1/statuses/user_timeline.json?screen_name='.$item.'&include_rts=true&count=20&include_entities=true';
} else { } else {
$twitterapi = 'https://api.twitter.com/1/lists/statuses.json?slug=unl&owner_screen_name=unlnews&page=1&include_entities=true'; $pieces = explode("/", $item);
$twitterapi = 'https://api.twitter.com/1/lists/statuses.json?slug='.$pieces[1].'&owner_screen_name='.$pieces[0].'&page=1&include_entities=true';
} }
$proxy = $base_path.'sites/all/themes/unl_digitalsignage/proxy.php?u='.urlencode($twitterapi); $proxy = $base_path.'sites/all/themes/unl_digitalsignage/proxy.php?u='.urlencode($twitterapi);
return drupal_add_js('UNL.digitalSignage.feeds["'.$fieldname.'"] = "'.$proxy.'"', 'inline'); return drupal_add_js('UNL.digitalSignage.feeds["'.$fieldname.'"] = "'.$proxy.'"', 'inline');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment