causefx 8 лет назад
Родитель
Сommit
45e09d4fd7
5 измененных файлов с 27 добавлено и 33 удалено
  1. 1 1
      api/functions/static-globals.php
  2. 0 5
      css/organizr.css
  3. 1 1
      js/custom.js
  4. 18 26
      js/functions.js
  5. 7 0
      js/version.json

+ 1 - 1
api/functions/static-globals.php

@@ -2,7 +2,7 @@
 
 // ===================================
 // Organizr Version
-$GLOBALS['installedVersion'] = '2.0.0-alpha.200';
+$GLOBALS['installedVersion'] = '2.0.0-alpha.250';
 // ===================================
 // Set GLOBALS from config file
 $GLOBALS['userConfigPath'] = dirname(__DIR__,1).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php';

+ 0 - 5
css/organizr.css

@@ -209,16 +209,11 @@ h2.m-b-0.font-medium.pull-right {
   overflow: hidden;
   filter: blur(0px) grayscale(1)
 }
-
-
 .mailbox-widget .customtab li.active a, .mailbox-widget .customtab li.active, .mailbox-widget .customtab li.active a:focus {
     background: 0 0;
     color: #fff;
     border-color: #53e69d;
 }
-.bootstrap-tagsinput, .calendar-widget, .chat-main-box, .content-wrap, .css-bar:after, .customtab li.active a, .customtab li.active a:focus, .customtab li.active a:hover, .daterangepicker .input-mini, .dropify-wrapper, .dropify-wrapper .dropify-preview, .dropzone, .footer, .form-control, .jsgrid-alt-row>td, .jsgrid-header-row>th, .jsgrid-row>td, .list-group-item, .list-group-item.disabled, .list-group-item.disabled:focus, .list-group-item.disabled:hover, .manage-table, .modal-content, .myadmin-dd .dd-list .dd-item .dd-handle, .myadmin-dd-empty .dd-list .dd3-content, .myadmin-dd-empty .dd-list .dd3-handle, .nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover, .pager li>a, .pager li>span, .pagination>li>a, .pagination>li>span, .panel, .panel .panel-footer, .panel-default .panel-body, .panel-default .panel-footer, .panel-default .panel-heading, .panel-footer textarea, .panel-white .panel-body, .panel-white .panel-footer, .panel-white .panel-heading, .radio label::before, .select2-container-multi .select2-choices, .table tbody tr.advance-table-row td, .thumbnail, .well, .white-box, input, pre, select, table.dataTable.display tbody tr.odd, table.dataTable.stripe tbody tr.odd {
-    background: transparent;
-}
 .nav-tabs.pull-right>li>a:hover {
     background: transparent;
     border-radius: 0px;

+ 1 - 1
js/custom.js

@@ -462,7 +462,7 @@ function pageLoad(){
     $('.inline-popups').magnificPopup({
       removalDelay: 500, //delay removal by X to allow out-animation
       closeOnBgClick: true,
-      closeOnContentClick: true,
+      //closeOnContentClick: true,
       callbacks: {
         beforeOpen: function() {
            this.st.mainClass = this.st.el.attr('data-effect');

+ 18 - 26
js/functions.js

@@ -1880,34 +1880,28 @@ function buildStreamItem(array,source){
 			</div>
 		</div>
 		<div id="`+v.session+`" class="white-popup mfp-with-anim mfp-hide">
-			<div class="row">
-				<div class="col-md-6 col-md-offset-3">
-
-					<div class="white-box m-b-0 bg-info">
-						<h3 class="text-white box-title m-b-0">`+v.sessionType+`<span class="pull-right"><i class="mdi mdi-network-upload"></i> `+v.bandwidth+` kbps</span></h3>
-					</div>
-					<div class="white-box">
-						<div class="row">
-							<div class="p-l-20 p-r-20">
-								<div class="pull-left">
-									<span class="text-uppercase"><i class="mdi mdi-`+v.bandwidthType+`"></i> `+v.bandwidthType+`</span>
-									<span class="text-uppercase"><i class="mdi mdi-account-network"></i> `+v.userAddress+`</span>
-									`+streamInfo+`
-									<div class="text-muted m-t-20 text-uppercase"><span class="text-uppercase"><i class="mdi mdi-`+source+`"></i> Product: `+v.userStream.product+`</span></div>
-									<div class="text-muted m-t-20 text-uppercase"><span class="text-uppercase"><i class="mdi mdi-laptop-mac"></i> Device: `+v.userStream.device+`</span></div>
-								</div>
-								<div data-label="`+v.watched+`%" class="css-bar css-bar-`+Math.ceil(v.watched/5)*5+` css-bar-lg m-b-0  css-bar-info pull-right">`+userThumb+`</div>
+			<div class="col-md-6 col-md-offset-3">
+				<div class="white-box m-b-0 bg-info">
+					<h3 class="text-white box-title m-b-0">`+v.sessionType+`<span class="pull-right"><i class="mdi mdi-network-upload"></i> `+v.bandwidth+` kbps</span></h3>
+				</div>
+				<div class="white-box">
+					<div class="row">
+						<div class="p-l-20 p-r-20">
+							<div class="pull-left">
+								<span class="text-uppercase"><i class="mdi mdi-`+v.bandwidthType+`"></i> `+v.bandwidthType+`</span>
+								<span class="text-uppercase"><i class="mdi mdi-account-network"></i> `+v.userAddress+`</span>
+								`+streamInfo+`
+								<div class="text-muted m-t-20 text-uppercase"><span class="text-uppercase"><i class="mdi mdi-`+source+`"></i> Product: `+v.userStream.product+`</span></div>
+								<div class="text-muted m-t-20 text-uppercase"><span class="text-uppercase"><i class="mdi mdi-laptop-mac"></i> Device: `+v.userStream.device+`</span></div>
 							</div>
+							<div data-label="`+v.watched+`%" class="css-bar css-bar-`+Math.ceil(v.watched/5)*5+` css-bar-lg m-b-0  css-bar-info pull-right">`+userThumb+`</div>
 						</div>
 					</div>
-
-                </div>
-			</div>
+				</div>
+            </div>
 		</div>
 		<div id="`+v.uid+`-metadata-div" class="white-popup mfp-with-anim mfp-hide">
-	        <div class="row">
-	            <div class="col-md-8 col-md-offset-2 `+v.uid+`-metadata-info"></div>
-	        </div>
+	        <div class="col-md-8 col-md-offset-2 `+v.uid+`-metadata-info"></div>
 	    </div>
 		`;
 		if(contains(''+count, end) || count == total ){ cards += '</div><!--end-->'; };
@@ -1937,9 +1931,7 @@ function buildRecentItem(array, type){
 			<span class="elip recent-title">`+v.title+`</span>
 			<a class="inline-popups `+v.uid+` hidden" href="#`+v.uid+`-metadata-div" data-effect="mfp-zoom-out"></a>
 			<div id="`+v.uid+`-metadata-div" class="white-popup mfp-with-anim mfp-hide">
-		        <div class="row">
-		            <div class="col-md-8 col-md-offset-2 `+v.uid+`-metadata-info"></div>
-		        </div>
+		        <div class="col-md-8 col-md-offset-2 `+v.uid+`-metadata-info"></div>
 		    </div>
 		</div>
 		`;

+ 7 - 0
js/version.json

@@ -47,5 +47,12 @@
         "new": "Plex Streams on homepage|Plex Recent Added on homepage|Emby Streams on homepage|Emby Recent Added on homepage|SabNZBd on homepage",
         "fixed": "Multiple things for performace",
         "notes": "This is alpha - expect bugs|Please report bugs in GitHub issues page"
+    },
+	"2.0.0-alpha.250": {
+        "date":"2018-02-05 21:00",
+        "title": "NZBGet Homepage",
+        "new": "NZBGet on homepage - please check for bugs",
+        "fixed": "",
+        "notes": "This is alpha - expect bugs|Please report bugs in GitHub issues page"
     }
 }