Merge pull request #406 from causefx/cero-dev

Cero dev

config/configDefaults.php

@@ -78,4 +78,5 @@ return array(
  "homepageNoticeMessage" => "",
  "homepageNoticeType" => "",
  "homepageNoticeAuth" => "false",
+ "homepageNoticeLayout" => "",
 );

css/style.css

@@ -912,6 +912,9 @@ button::-moz-focus-inner {
 html, body {
   height: 100%;
 }
+::-webkit-scrollbar { 
+   display: none;
+}
 
 body {
   font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -922,6 +925,10 @@ body {
   position: relative;
   background: #F1F4F5;
   overflow-x: hidden;
+  overflow-x:hidden; 
+  /*MS Edge */
+  -ms-overflow-style: -ms-autohiding-scrollbar;
+  -ms-overflow-style: none; 
 }
 
 .main-wrapper {

functions.php

@@ -2,7 +2,7 @@
 
 // ===================================
 // Define Version
- define('INSTALLEDVERSION', '1.375');
+ define('INSTALLEDVERSION', '1.38');
 // ===================================
 
 // Debugging output functions
@@ -721,7 +721,7 @@ function outputRecentAdded($header, $items, $script = false, $array) {
     if (!count($items)) {
         return '<div id=recentMedia><h5 class="text-center">'.$header.'</h5><p class="text-center">No Media Found</p></div>';
     }else{
-        return '<div id=recentMedia><h5 style="margin-bottom: -25px" class="text-center">'.$header.'</h5><div class="recentHeader inbox-pagination">'.$hideMenu.'</div><br/><div class="recentItems">'.implode('',$items).'</div></div>'.($script?'<script>'.$script.'</script>':'');
+        return '<div id=recentMedia><h5 style="margin-bottom: -20px" class="text-center">'.$header.'</h5><div class="recentHeader inbox-pagination">'.$hideMenu.'</div><br/><div class="recentItems">'.implode('',$items).'</div></div>'.($script?'<script>'.$script.'</script>':'');
     }
     
 }
@@ -2783,5 +2783,58 @@ function sendResult($result, $icon = "floppy-o", $message = false, $success = "W
 	return $msg;
 }
 
+function buildHomepageNotice($layout, $type, $title, $message){
+    switch ($layout) {
+		      case 'elegant':
+            return '
+            <div id="homepageNotice" class="row">
+                <div class="col-lg-12">
+                    <div class="content-box big-box box-shadow panel-box panel-'.$type.'">
+                        <div class="content-title i-block">
+                            <h4 class="zero-m"><strong>'.$title.'</strong></h4>
+                            <div class="content-tools i-block pull-right">
+                                <a class="close-btn">
+                                    <i class="fa fa-times"></i>
+                                </a>
+                            </div>
+                        </div>
+                        <p>'.$message.'</p>
+                    </div>
+                </div>
+            </div>
+            ';
+            break;
+        case 'basic':
+            return '
+            <div id="homepageNotice" class="row">
+                <div class="col-lg-12">
+                    <div class="panel panel-'.$type.'">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">'.$title.'</h3>
+                        </div>
+                        <div class="panel-body">
+                            '.$message.'
+                        </div>
+                    </div>
+                </div>
+            </div>
+            ';
+            break;
+        case 'jumbotron';
+            return '
+            <div id="homepageNotice" class="row">
+                <div class="col-lg-12">
+                    <div class="jumbotron">
+                        <div class="container">
+                            <h1>'.$title.'</h1>
+                            <p>'.$message.'</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            ';
+    }
+}
+
 // Always run this
 dependCheck();

homepage.php

@@ -257,23 +257,7 @@ endif; ?>
 <!-- <button id="numBnt">Numerical</button> -->
                 <br/>
  
-                <?php if (qualifyUser(HOMEPAGENOTICEAUTH) && HOMEPAGENOTICETITLE && HOMEPAGENOTICETYPE && HOMEPAGENOTICEMESSAGE) { ?>
-                <div class="row">
-                    <div class="col-lg-12">
-                        <div class="content-box big-box box-shadow panel-box panel-<?php echo HOMEPAGENOTICETYPE; ?>">
-                            <div class="content-title i-block">
-                                <h4 class="zero-m"><strong><?php echo HOMEPAGENOTICETITLE; ?></strong></h4>
-                                <div class="content-tools i-block pull-right">
-                                    <a class="close-btn">
-                                        <i class="fa fa-times"></i>
-                                    </a>
-                                </div>
-                            </div>
-                            <p><?php echo HOMEPAGENOTICEMESSAGE; ?></p>
-                        </div>
-                    </div>
-                </div>
-                <?php } ?>
+                <?php if (qualifyUser(HOMEPAGENOTICEAUTH) && HOMEPAGENOTICETITLE && HOMEPAGENOTICETYPE && HOMEPAGENOTICEMESSAGE && HOMEPAGENOTICELAYOUT) { echo buildHomepageNotice(HOMEPAGENOTICELAYOUT, HOMEPAGENOTICETYPE, HOMEPAGENOTICETITLE, HOMEPAGENOTICEMESSAGE); } ?>
                 
                 <?php if (qualifyUser(HOMEPAGECUSTOMHTML1AUTH) && HOMEPAGECUSTOMHTML1) { echo "<div>" . HOMEPAGECUSTOMHTML1 . "</div>"; } ?>
 
@@ -415,7 +399,6 @@ endif; ?>
                 <?php } ?>
                 <?php if((NZBGETURL != "" && qualifyUser(NZBGETHOMEAUTH)) || (SABNZBDURL != "" && qualifyUser(SABNZBDHOMEAUTH))) { ?>
                 <div id="downloadClientRow" class="row">
-                    <sort>2</sort>
                     <div class="col-xs-12 col-md-12">
                         <div class="content-box">
                             <div class="tabbable panel with-nav-tabs panel-default">
@@ -490,8 +473,6 @@ endif; ?>
                 </div>
                 <div id="plexRow" class="row">
                     <div class="col-lg-12">
-                        <sort>3</sort>
-
                     <?php
                     if(PLEXRECENTMOVIE || PLEXRECENTTV || PLEXRECENTMUSIC){  
                         $plexArray = array("movie" => PLEXRECENTMOVIE, "season" => PLEXRECENTTV, "album" => PLEXRECENTMUSIC);
@@ -503,8 +484,6 @@ endif; ?>
 				<?php } ?>
 				<?php if (qualifyUser(EMBYHOMEAUTH) && EMBYTOKEN) { ?>
                 <div id="embyRow" class="row">
-                    <sort>3</sort>
-
                     <?php
                     $embySize = (EMBYRECENTMOVIE == "true") + (EMBYRECENTTV == "true") + (EMBYRECENTMUSIC == "true") + (EMBYPLAYINGNOW == "true");
                     if(EMBYRECENTMOVIE == "true"){ echo getEmbyRecent("movie", 12/$embySize); }
@@ -517,7 +496,6 @@ endif; ?>
 				<?php } ?>
                 <?php if ((SONARRURL != "" && qualifyUser(SONARRHOMEAUTH)) || (RADARRURL != "" && qualifyUser(RADARRHOMEAUTH)) || (HEADPHONESURL != "" && qualifyUser(HEADPHONESHOMEAUTH)) || (SICKRAGEURL != "" && qualifyUser(SICKRAGEHOMEAUTH))) { ?>
                 <div id="calendarLegendRow" class="row" style="padding: 0 0 10px 0;">
-                    <sort>1</sort>
                     <div class="col-lg-12 content-form form-inline">
                         <div class="form-group">
                             <select class="form-control" id="imagetype_selector" style="width: auto !important; display: inline-block">
@@ -535,7 +513,6 @@ endif; ?>
                     </div>
                 </div>
                 <div id="calendarRow" class="row">
-                    <sort>1</sort>
                     <div class="col-lg-12">
                         <div id="calendar" class="fc-calendar box-shadow fc fc-ltr fc-unthemed"></div>
                     </div>

index.php

@@ -1452,7 +1452,7 @@ endif; ?>
 
                     $("#content div[class^='iframe active']").attr("class", "iframe hidden");
 
-                    $( '<div class="iframe active" data-content-url="'+thisid+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%; position: absolute;" src="'+thisid+'"></iframe></div>' ).appendTo( "#content" );
+                    $( '<div class="iframe active" data-content-url="'+thisid+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%; position: absolute;" src="'+thisid+'"></iframe></div>' ).appendTo( "#content" );
                     document.title = thistitle;
                    // window.location.href = '#' + thisname;
 

lang/en.ini

@@ -255,4 +255,5 @@ SPEED_TEST = "Speed Test"
 NOTICE_COLOR = "Notice Color"
 NOTICE_TITLE = "Notice Title"
 NOTICE_MESSAGE = "Notice Message"
-SHOW_NAMES = "Show Names'
+SHOW_NAMES = "Show Names"
+NOTICE_LAYOUT = "Notice Layout"

lang/es.ini

@@ -255,4 +255,5 @@ SPEED_TEST = "Speed Test"
 NOTICE_COLOR = "Notice Color"
 NOTICE_TITLE = "Notice Title"
 NOTICE_MESSAGE = "Notice Message"
-SHOW_NAMES = "Show Names'
+SHOW_NAMES = "Show Names"
+NOTICE_LAYOUT = "Notice Layout"

lang/fr.ini

@@ -255,4 +255,5 @@ SPEED_TEST = "Speed Test"
 NOTICE_COLOR = "Notice Color"
 NOTICE_TITLE = "Notice Title"
 NOTICE_MESSAGE = "Notice Message"
-SHOW_NAMES = "Show Names'
+SHOW_NAMES = "Show Names"
+NOTICE_LAYOUT = "Notice Layout"

lang/it.ini

@@ -255,4 +255,5 @@ SPEED_TEST = "Speed Test"
 NOTICE_COLOR = "Notice Color"
 NOTICE_TITLE = "Notice Title"
 NOTICE_MESSAGE = "Notice Message"
-SHOW_NAMES = "Show Names'
+SHOW_NAMES = "Show Names"
+NOTICE_LAYOUT = "Notice Layout"

lang/nl.ini

@@ -255,4 +255,5 @@ SPEED_TEST = "Speed Test"
 NOTICE_COLOR = "Notice Color"
 NOTICE_TITLE = "Notice Title"
 NOTICE_MESSAGE = "Notice Message"
-SHOW_NAMES = "Show Names'
+SHOW_NAMES = "Show Names"
+NOTICE_LAYOUT = "Notice Layout"

lang/pl.ini

@@ -255,4 +255,5 @@ SPEED_TEST = "Speed Test"
 NOTICE_COLOR = "Notice Color"
 NOTICE_TITLE = "Notice Title"
 NOTICE_MESSAGE = "Notice Message"
-SHOW_NAMES = "Show Names'
+SHOW_NAMES = "Show Names"
+NOTICE_LAYOUT = "Notice Layout"