causefx 8 лет назад
Родитель
Сommit
9018f16c9e
4 измененных файлов с 9 добавлено и 5 удалено
  1. 2 2
      css/themes/Organizr.css
  2. 2 1
      index.php
  3. 4 2
      js/functions.js
  4. 1 0
      js/jquery-2.2.4.min.js

+ 2 - 2
css/themes/Organizr.css

@@ -316,10 +316,10 @@ a.mytooltip {
   background: #1b1b1b;
   background: #1b1b1b;
 }
 }
 .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th {
 .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th {
-  /*padding: 8px;
+  padding: 8px;
   line-height: 1.42857143;
   line-height: 1.42857143;
   vertical-align: middle;
   vertical-align: middle;
-  border-top: transparent;*/
+  /*border-top: transparent;*/
 }
 }
 .jq-icon-info { background-color: rgba(71, 68, 68, 0.93); color: #FFF; border-color: #bce8f1; }
 .jq-icon-info { background-color: rgba(71, 68, 68, 0.93); color: #FFF; border-color: #bce8f1; }
 .jq-icon-warning { background-color: rgba(154, 83, 20, 0.93); color: #fcf8e3; border-color: #faebcc; }
 .jq-icon-warning { background-color: rgba(154, 83, 20, 0.93); color: #fcf8e3; border-color: #faebcc; }

+ 2 - 1
index.php

@@ -100,7 +100,8 @@
 		<!-- ============================================================== -->
 		<!-- ============================================================== -->
 	</div><!-- /#wrapper -->
 	</div><!-- /#wrapper -->
 	<!-- jQuery -->
 	<!-- jQuery -->
-	<script src="plugins/bower_components/jquery/dist/jquery.min.js"></script>
+	<!--<script src="plugins/bower_components/jquery/dist/jquery.min.js"></script>-->
+	<script src="js/jquery-2.2.4.min.js"></script>
 	<script src="bootstrap/dist/js/bootstrap.min.js"></script>
 	<script src="bootstrap/dist/js/bootstrap.min.js"></script>
 	<script src="plugins/bower_components/sidebar-nav/dist/sidebar-nav.js"></script>
 	<script src="plugins/bower_components/sidebar-nav/dist/sidebar-nav.js"></script>
 	<script src="js/jquery.slimscroll.js"></script>
 	<script src="js/jquery.slimscroll.js"></script>

+ 4 - 2
js/functions.js

@@ -310,7 +310,7 @@ function popTab(tab, type){
 		case '_blank':
 		case '_blank':
 		case 'popout':
 		case 'popout':
 			console.log('Tab Function: Creating New Window for tab: '+tab);
 			console.log('Tab Function: Creating New Window for tab: '+tab);
-			var url = $('#container-'+cleanClass(tab)).attr('data-url');
+			var url = $('#menu-'+cleanClass(tab)).attr('data-url');
 			window.open(url, '_blank');
 			window.open(url, '_blank');
 			break;
 			break;
 		default:
 		default:
@@ -970,7 +970,7 @@ function buildInternalContainer(name,url,type){
 	return `<div id="internal-`+cleanClass(name)+`" data-type="`+type+`" class="internal-container frame-`+cleanClass(name)+` hidden" data-url="`+url+`" data-name="`+cleanClass(name)+`"></div>`;
 	return `<div id="internal-`+cleanClass(name)+`" data-type="`+type+`" class="internal-container frame-`+cleanClass(name)+` hidden" data-url="`+url+`" data-name="`+cleanClass(name)+`"></div>`;
 }
 }
 function buildMenuList(name,url,type,icon){
 function buildMenuList(name,url,type,icon){
-	return `<li id="menu-`+cleanClass(name)+`" type="`+type+`"><a class="waves-effect" onclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);">`+iconPrefix(icon)+`<span class="hide-menu">`+name+`</span></a></li>`;
+	return `<li id="menu-`+cleanClass(name)+`" type="`+type+`" data-url="`+url+`"><a class="waves-effect" onclick="tabActions(event,'`+cleanClass(name)+`',`+type+`);">`+iconPrefix(icon)+`<span class="hide-menu">`+name+`</span></a></li>`;
 }
 }
 function tabProcess(arrayItems) {
 function tabProcess(arrayItems) {
 	var iFrameList = '';
 	var iFrameList = '';
@@ -1469,6 +1469,7 @@ function organizrAPI(type,path,data=null){
 				beforeSend: function(request) {
 				beforeSend: function(request) {
 					request.setRequestHeader("Token", activeInfo.token);
 					request.setRequestHeader("Token", activeInfo.token);
 				},
 				},
+				timeout: 10000,
 			});
 			});
 			break;
 			break;
 		case 'post':
 		case 'post':
@@ -1480,6 +1481,7 @@ function organizrAPI(type,path,data=null){
 				beforeSend: function(request) {
 				beforeSend: function(request) {
 					request.setRequestHeader("Token", activeInfo.token);
 					request.setRequestHeader("Token", activeInfo.token);
 				},
 				},
+				timeout: 10000,
 				data:{
 				data:{
 					data: data,
 					data: data,
 				}
 				}

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
js/jquery-2.2.4.min.js


Некоторые файлы не были показаны из-за большого количества измененных файлов