From 455d3111d9d69204272b9e24fb88670362385c31 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 18 Jul 2014 15:07:28 -0400 Subject: [PATCH] add subtitle delivery methods to StreamBuilder --- dashboard-ui/css/librarybrowser.css | 74 ++++++++++++++---------- dashboard-ui/itemdetails.html | 65 ++++++++++----------- dashboard-ui/scripts/edititemmetadata.js | 2 +- dashboard-ui/scripts/librarylist.js | 4 +- dashboard-ui/scripts/sync.js | 15 +++++ 5 files changed, 93 insertions(+), 67 deletions(-) create mode 100644 dashboard-ui/scripts/sync.js diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index aedc4733f9..47ac995d82 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1,6 +1,6 @@ /* Fixes the issue of jqm panels altering the page background. */ .ui-panel-content-wrap { - background: none!important; + background: none !important; } .ui-panel fieldset + fieldset { @@ -13,7 +13,7 @@ } .backdropPage { - background-color: rgba(15, 15,15, .94)!important; + background-color: rgba(15, 15,15, .94) !important; } .backdropContainer { @@ -119,11 +119,11 @@ @media all and (min-width: 1600px) { - .ehsContent { + .ehsContent { width: 1200px; } - .squareEhsContent { + .squareEhsContent { width: 1200px; } } @@ -151,11 +151,11 @@ } .viewControls + .listTopPaging { - margin-left: .5em!important; + margin-left: .5em !important; } .labelPageSize { - margin-left: 1em!important; + margin-left: 1em !important; display: inline !important; } @@ -163,9 +163,21 @@ display: inline-block; } +.itemImageContainer { + vertical-align: top; + padding: 0 .8em 0 0; + display: inline-block; +} + +@media all and (min-width: 650px) { + .itemImageContainer { + float: left; + } +} + @media all and (max-width: 650px) { .pageSizeContainer { - display: none!important; + display: none !important; } } @@ -301,7 +313,7 @@ } .criticRatingSummary { - color: #506A16!important; + color: #506A16 !important; background-color: #F2F0C4; background-image: -webkit-gradient(linear,left top,left bottom,from(#FFE37C),to(#F2F0C4)); background-image: -webkit-linear-gradient(top,#FFE37C,#F2F0C4); @@ -324,9 +336,9 @@ padding: 5px 7px; font-size: 13px; margin: 0 5px 5px 0; - color: #fff!important; + color: #fff !important; text-decoration: none; - font-weight: normal!important; + font-weight: normal !important; } a.itemTag:hover { @@ -396,10 +408,10 @@ a.itemTag:hover { position: fixed; top: 105px; text-decoration: none; - font-weight: normal!important; + font-weight: normal !important; display: none; background-color: rgba(0,0,0,0.6); - color: #ddd!important; + color: #ddd !important; background-color: transparent; padding: 0; } @@ -411,7 +423,7 @@ a.itemTag:hover { @media all and (max-width: 1000px) { .lnkSibling { - display: none!important; + display: none !important; } } @@ -529,8 +541,8 @@ a.itemTag:hover { } .lblDetailTab { - font-size: 14px!important; - font-weight: 400!important; + font-size: 14px !important; + font-weight: 400 !important; font-family: 'Open Sans'; padding: .5em 1em; border-color: #1f1f1f !important; @@ -562,22 +574,22 @@ a.itemTag:hover { } .mediaBrowserAccent { - color: #52B54B!important; + color: #52B54B !important; } .libraryPanelCollapsibleHeader a { font-size: 16px; - font-weight: 300!important; + font-weight: 300 !important; font-family: 'Open Sans', Arial, Helvetica, sans-serif; } .selectedLibraryPanelLink { - background: #38c!important; + background: #38c !important; } .libraryPanelLink { font-size: 14px; - font-weight: 300!important; + font-weight: 300 !important; font-family: 'Open Sans', Arial, Helvetica, sans-serif; } @@ -644,9 +656,9 @@ a.itemTag:hover { } .inlineItemName + .itemMiscInfo { - margin-left: 0!important; + margin-left: 0 !important; margin-top: 1em; - display: block!important; + display: block !important; } .primaryDetailPageContent { @@ -654,7 +666,7 @@ a.itemTag:hover { } .primaryDetailPageContent .userDataIcons { - margin-left: 0!important; + margin-left: 0 !important; margin-top: 1.5em; display: block; } @@ -819,19 +831,19 @@ a.itemTag:hover { } .scenePosterViewItem img { - max-width: 150px!important; + max-width: 150px !important; } @media all and (min-width: 650px) { .libraryTabs .ui-btn-inner { - padding: .5em 15px!important; + padding: .5em 15px !important; } } @media all and (min-width: 1200px) { .scenePosterViewItem img { - max-width: 200px!important; + max-width: 200px !important; } } @@ -941,16 +953,16 @@ a.itemTag:hover { display: block; text-decoration: none; padding: 1px 0; - color: #bbb!important; + color: #bbb !important; } .alphabetPicker a:hover:not(.selectedCharacter) { - background: #666!important; - color: #fff!important; + background: #666 !important; + color: #fff !important; } .selectedCharacter { - color: #fff!important; + color: #fff !important; background: #4d90fe; } @@ -1157,7 +1169,7 @@ a.itemTag:hover { @media all and (min-height: 1079px) and (min-width: 1400px) { .type-home { - overflow-x: visible!important; + overflow-x: visible !important; } } @@ -1223,7 +1235,7 @@ a.itemTag:hover { .itemsListview { max-width: 800px; - margin: 0 auto!important; + margin: 0 auto !important; } .itemsListview .ui-li-aside { diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 7f40c1178e..cae213d3f3 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -108,39 +108,38 @@
- - - - - -
-
-
-
-
- 		-

-

- - -

-

-

-

-
- - - - - ${ButtonPlayTrailer} - ${ButtonPlay} - ${ButtonEdit} -
-
+
+ +
+
+
+
+ +
+

+

+ + +

+

+

+

+
+ + + + + ${ButtonPlayTrailer} + ${ButtonPlay} + ${ButtonEdit} +
+
+ +