Changeset 2672
- Timestamp:
- Oct 25, 2016, 1:03:32 PM (4 years ago)
- Location:
- admin-center/trunk/fuentes
- Files:
-
- 5 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/css/main.css
r2027 r2672 6 6 7 7 8 .noselect { 9 -webkit-touch-callout: none; /* iOS Safari */ 10 -webkit-user-select: none; /* Chrome/Safari/Opera */ 11 -khtml-user-select: none; /* Konqueror */ 12 -moz-user-select: none; /* Firefox */ 13 -ms-user-select: none; /* Internet Explorer/Edge */ 14 user-select: none; /* Non-prefixed version, currently 15 not supported by any browser */ 16 } 8 17 9 18 html{ … … 18 27 padding: 0px; 19 28 margin: 0px; height: 100%; 20 /*background: #f5f5f5;*/29 background: #f5f5f5; 21 30 22 background-image: url(img/bg .png);31 background-image: url(img/bggrey.png); 23 32 background-size: cover; 24 33 … … 43 52 } 44 53 54 55 .login_header{ 56 height: 120px; 57 background: url(img/admincenter_logo.png) no-repeat; 58 59 } 60 45 61 .topBanner{ 46 62 margin: 0px; … … 49 65 height: 60px; 50 66 color: #ffffff; 51 background: # 03A9F4;67 background: #424f5a; 52 68 text-align: right; 53 69 margin-bottom:30px; … … 88 104 .menuitem:hover{ 89 105 cursor: pointer; 106 /*background: #FFA726 !important; 107 color: #ff00ff;*/ 90 108 } 91 109 … … 169 187 } 170 188 189 .adminCenterHelper{ 190 position: absolute; 191 top: 100px; 192 right: 50px; 193 width: 50px; 194 height:50px; 195 border-radius: 25px; 196 background-color: #424F5A; 197 color: #ffffff; 198 font-size: xx-large; 199 text-align: center; 200 } 201 202 .adminCenterHelper:hover{ 203 cursor: pointer; 204 } 205 206 .adminCenterHelperQuestion{ 207 margin-top: -5px; 208 } 209 210 .adminCenterHelperDescription{ 211 padding: 0px; 212 margin-top: -10px; 213 font-size: x-small; 214 } 171 215 172 216 /*tr{ … … 199 243 .divider-color { border-color: #B6B6B6 !important; } 200 244 201 .btn-primary { background: # 03A9F4!important; color: #ffffff !important;}245 .btn-primary { background: #424f5a !important; color: #ffffff !important;} 202 246 203 247 .modal-body{ -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/css/sidebar-menu.css
r1055 r2672 22 22 height: 100%; 23 23 margin-left: -250px; 24 overflow-y: auto;25 24 /*background: #000;*/ 26 25 /*background: #009688;*/ … … 29 28 -o-transition: all 0.5s ease; 30 29 transition: all 0.5s ease; 30 overflow-y: auto !important; 31 31 } 32 32 #wrapper.toggled #sidebar-wrapper { … … 186 186 187 187 #sidebar_header{ 188 /*height: 256px;188 height: 256px; 189 189 width: 250px; 190 background-image: url(img/ head.png);190 background-image: url(img/admincenter_logo_menu.png); 191 191 /* 192 192 -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/i18n/ca-ES@valencia/messages.json
r1055 r2672 6 6 "plural_forms" : "nplurals=2; plural=(n != 1);" 7 7 }, 8 "Help":["Ajuda"], 8 9 "Server Admin" : [ "Administra El Servidor"], 9 10 "Server Info" : [ "Informació del servidor"], -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/i18n/en-US/messages.json
r1512 r2672 6 6 "plural_forms" : "nplurals=2; plural=(n != 1);" 7 7 }, 8 "Help":["Help"], 8 9 "Unauthenticated":["Unauthenticaded"], 9 10 "main.Authentication":["Authentication"], -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/i18n/es-ES/messages.json
r1345 r2672 6 6 "plural_forms" : "nplurals=2; plural=(n != 1);" 7 7 }, 8 "Help":["Ayuda"], 8 9 "Server Admin" : [ "Administración del Servidor"], 9 10 "Server Info" : [ "Información del servidor"], -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/js/main.js
r2160 r2672 176 176 //console.log("loading "+layoutFile); 177 177 178 179 // Check if exists help markdown for module and renders help button 180 /*if (moduleInfo['help']) { 181 //alert(moduleInfo['help']); // HELPER!!! 182 alert(typeof(moduleDiv)); 183 console.log($(moduleDiv)); 184 $(moduleDiv).append("<div>ESTO TIENE AYUDA!!!</div>"); 185 console.log($(moduleDiv)); 186 }*/ 187 188 178 189 // Getting module layout (main html) 179 $.post('moduleManager.php', {action: "getModuleLayout", filename:layoutFile, id:moduleInfo['id'] },190 $.post('moduleManager.php', {action: "getModuleLayout", filename:layoutFile, id:moduleInfo['id'], help:moduleInfo['help'],iscomponentof:""}, 180 191 function(moduleDiv){ 192 193 181 194 // Loading and applying locales 182 195 $("#moduleContainer").append(moduleDiv); … … 197 210 // Getting layout for each component 198 211 var div_id=moduleInfo['components'][i]['id']; 199 $.post('moduleManager.php', {action: "getModuleLayout", filename: layoutFile, id:div_id}, 212 213 $.post('moduleManager.php', {action: "getModuleLayout", filename: layoutFile, id:div_id, help:moduleInfo['components'][i]['help'], iscomponentof:moduleInfo['id']}, 200 214 function(moduleDiv){ 215 201 216 $("#moduleContainer").append(moduleDiv); 202 217 … … 206 221 $.each(item_list, function(index, item){ 207 222 i18n.translateHtml(moduleInfo['id'], item); 223 }); 224 225 // Link helper button... 226 $(".adminCenterHelper").off("click"); 227 $(".adminCenterHelper").on("click", function(event){ 228 event.stopPropagation(); 229 var help=$(event.currentTarget).attr("help"); 230 var module=$(event.currentTarget).attr("module"); 231 var parent=$(event.currentTarget).attr("parent"); 232 var moduledir; 233 if (parent=="") moduledir=module; 234 else moduledir=parent; 235 Utils.showHelp(moduledir, help); 236 //alert(); 208 237 }); 209 238 … … 322 351 }); 323 352 324 325 353 i18n.loadLocales( 326 354 // Applying Locales for main gui -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/lib/i18n.js
r2238 r2672 135 135 } 136 136 137 i18n=new I18n(); 137 138 138 i18n=new I18n(); 139 140 $(document).ready(function() { 141 $.ajaxSetup({ cache: false }); 142 }); -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/lib/utils.js
r2581 r2672 12 12 this.formFactory=new formFactory(); 13 13 this.crypt=new JSEncrypt(); // Class to encrypt and decrypt keys 14 this.showMarkDown=new showdown.Converter(); 14 15 } 15 16 … … 17 18 return ( i18n.gettext("main", text)); 18 19 }; 20 19 21 20 22 UtilsClass.prototype.msg=function msg(message, type){ … … 461 463 // Set public key for this connection with serverKey 462 464 Utils.crypt.setPublicKey(sessionStorage.serverKey); 465 $("body").css("cursor", "wait"); 463 466 //$.post('n4d.php', 464 467 $.ajax( … … 473 476 //args: n4dargs}, 474 477 success: function(ret_coded){ 478 $("body").css("cursor", "default"); 475 479 console.log(ret_coded); 476 480 ret_str=(CryptoJS.AES.decrypt(JSON.stringify(ret_coded), sessionStorage.password,{format: CryptoJSAesJson}).toString(CryptoJS.enc.Utf8)); … … 479 483 callback(ret); 480 484 },error(){ 485 $("body").css("cursor", "default"); 481 486 msg=_("N4d.Error.Connection"); 482 487 self.msg(msg, MSG_ERROR); … … 555 560 } 556 561 }); 557 } 558 562 } 559 563 }); 560 564 561 565 }; 562 563 564 566 565 567 /* … … 571 573 */ 572 574 575 /*UtilsClass.prototype.loadHelpFile=function loadHelpFile(fullpath){ 576 var ret; 577 var self=this; 578 try{ 579 $.ajax({ 580 url: fullpath, 581 success: function(message){ 582 bootbox.alert(self.showMarkDown.makeHtml(message)); 583 self.return(true); 584 }, 585 error: function (){ 586 alert("Failed loading "+fullpath); 587 self.return(true); 588 } 589 }); 590 } 591 catch(err){ 592 self.return(false); 593 } 594 595 596 }*/ 597 598 UtilsClass.prototype.showHelp=function showHelp(path, file){ 599 var self=this; 600 var fullpath="modules/"+path+"/src/help/"+navigator.language+"/"+file; 601 602 //var fullpath="modules/"+path+"/src/help/es-ES/"+file; 603 //var success=self.loadHelpFile(fullpath); 604 605 $.ajax({ 606 url: fullpath, 607 success: function(message){ 608 bootbox.alert(self.showMarkDown.makeHtml(message)); 609 }, 610 error: function (){ 611 alert("Failed loading "+fullpath); 612 } 613 }); 614 615 616 /*if (!success) {alert("111::");return 0;} // if help file does noet exists for current lang, check other languages 617 /*else if (self.loadHelpFile("modules/"+path+"/src/help/ca-ES/"+file)) {alert("2222222");return 0;} 618 else if (self.loadHelpFile("modules/"+path+"/src/help/es-ES/"+file)) {alert("3333333");return 0;} 619 else {self.loadHelpFile("modules/"+path+"/src/help/en-US/"+file); alert("4444444");} 620 return 0;*/ 621 } 573 622 574 623 UtilsClass.prototype.waitwin=new WaitWin(); -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/login.php
r2581 r2672 25 25 <script type="text/javascript" src="lib/waitwin.js"></script> 26 26 <script type="text/javascript" src="lib/formFactory.js"></script> 27 <script type="text/javascript" src="lib/markdown/showdown.min.js"></script> 27 28 <script type="text/javascript" src="lib/utils.js"></script> 28 29 … … 77 78 ?> 78 79 79 <div id="login" class="jumbotron col-lg-4 col-lg-offset-4" style="margin-top: 200px;"> 80 <h3><?php echo (gt("Authentication")); ?></h3> 81 <div id="loginform" class="form-group"> 80 <div id="login" class="jumbotron col-lg-4 col-lg-offset-4" style="margin-top: 150px; padding: 0px"> 81 82 <div class="login_header"></div> 83 84 85 <!--h3 style="text-align:center;"><?php echo (gt("Authentication")); ?></h3--> 86 <div id="loginform" style="padding: 30px;"> 82 87 83 88 <label for="input_username" class="control-label"><?php echo (gt("Username")); ?></label> -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/main.php
r2581 r2672 100 100 echo ('<script type="text/javascript" src="lib/waitwin.js"></script>'); 101 101 echo ('<script type="text/javascript" src="lib/formFactory.js"></script>'); 102 echo ('<script type="text/javascript" src="lib/markdown/showdown.min.js"></script>'); 102 103 echo ('<script type="text/javascript" src="lib/utils.js"></script>'); 103 104 echo ('<script type="text/javascript" src="lib/nouislider/nouislider.min.js"></script>'); … … 105 106 echo ('<script type="text/javascript" src="lib/cryptojs-aes/aes.js"></script>'); 106 107 echo ('<script type="text/javascript" src="lib/cryptojs-aes/aes-json-format.js"></script>'); 108 107 109 108 110 -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/moduleManager.php
r1055 r2672 9 9 break; 10 10 case 'getModuleLayout': 11 getModuleLayout($_POST["id"], $_POST["filename"] );11 getModuleLayout($_POST["id"], $_POST["filename"], $_POST["help"], $_POST["iscomponentof"]); 12 12 break; 13 13 … … 59 59 } 60 60 61 function getModuleLayout($id, $filename ){61 function getModuleLayout($id, $filename, $help, $iscomopnentof){ 62 62 header('Content-type: text/html'); 63 63 header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0"); 64 64 header("Cache-Control: post-check=0, pre-check=0", false); 65 65 header("Pragma: no-cache"); 66 66 67 67 68 echo "<div class='moduleWindow' id='$id'>"; 69 if ($help) echo "<div class='adminCenterHelper' help='$help' module='$id' parent='$iscomopnentof' title='Help'> 70 <div class='adminCenterHelperQuestion'>?</div> 71 <div i18n class='adminCenterHelperDescription'>Help</div> 72 </div>"; 68 73 require($filename); 69 74 echo "</div>"; -
admin-center/trunk/fuentes/debian/changelog
r2581 r2672 1 admin-center (0.5.11) xenial; urgency=high 2 3 * Added markdown files support for help 4 5 -- <joamuran@gmail.com> Tue, 25 Oct 2016 13:02:09 +0200 6 1 7 admin-center (0.5.10) xenial; urgency=high 2 8
Note: See TracChangeset
for help on using the changeset viewer.