Changeset 2002
- Timestamp:
- Jun 23, 2016, 5:25:04 PM (5 years ago)
- Location:
- admin-center/trunk/fuentes
- Files:
-
- 3 added
- 5 deleted
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
admin-center/trunk/fuentes/admin-center.install/etc/n4d/conf.d/TaskMan
r1869 r2002 11 11 getTaskStatus=anonymous,* 12 12 listenTask=anonymous,* 13 prepareLogForDownload=admin,admins,adm -
admin-center/trunk/fuentes/admin-center.install/usr/lib/python2.7/actasks.py
r1893 r2002 67 67 "filepipe": self.filepipe}); 68 68 69 def getFilePipe(self): 70 ''' 71 Returns this task filepipe 72 ''' 73 return self.filepipe 69 74 70 75 def getStatus(self): -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/css/main.css
r1893 r2002 1 /*@font-face2 {3 font-family: 'SanFranciscoBold';4 src: url(fonts/San-Francisco/System-San-Francisco-Display-Bold.ttf);5 }6 7 1 @font-face 8 2 { 9 font-family: 'SanFranciscoRegular'; 10 src: url(fonts/San-Francisco/System-San-Francisco-Display-Regular.ttf); 11 } 12 13 @font-face 14 { 15 font-family: 'SanFranciscoThin'; 16 src: url(fonts/San-Francisco/System-San-Francisco-Display-Thin.ttf); 17 } 18 */ 3 font-family: 'Noto Sans'; 4 src: url(fonts/NotoSans-Regular.ttf); 5 } 6 7 19 8 20 9 html{ … … 29 18 padding: 0px; 30 19 margin: 0px; height: 100%; 31 background: #f5f5f5; 20 /*background: #f5f5f5;*/ 21 22 /*background-image: url(img/bg.png);*/ 23 background-size: cover; 24 32 25 color: #000; 26 font-family: 'Noto Sans'; 33 27 /* font-family: "Ubuntu light", ubuntu;*/ 34 28 /* font-family: "SanFranciscoRegular" !important;*/ … … 49 43 } 50 44 45 .topBanner{ 46 margin: 0px; 47 border: 0px; 48 padding:3px; 49 height: 60px; 50 color: #ffffff; 51 background: #03A9F4; 52 text-align: right; 53 margin-bottom:30px; 54 box-shadow: 0px 2px 5px #333333; 55 56 } 57 51 58 #bt_logout{ 52 font-weight: bold;59 /* font-weight: bold; 53 60 border: 1px solid; 54 61 border-radius: 2px; 55 padding: 2px; 62 padding: 2px;*/ 63 position: fixed; 64 bottom: 10px; 56 65 } 57 66 … … 101 110 .moduleIcon{ 102 111 display: block; 103 width: 32px;104 height: 32px;112 width: 24px; 113 height: 24px; 105 114 background-size: cover; 106 margin: 5px 10px 5px10px;115 margin: 10px; 107 116 108 117 } … … 139 148 .modal-content-log{ 140 149 padding: 2px; 141 border: 1px solid #333333; 142 background-color: #ffffee; 150 border: 1px solid #ededed; 151 background-color: #fdf6e3; 152 color: #70848a; 143 153 font-family: monospace; 144 154 height: 400px; … … 146 156 overflow-x: hidden; 147 157 text-overflow: "..."; 158 box-shadow: rgba(0, 0, 0, 0.2) 0px 8px 17px 0px, rgba(0, 0, 0, 0.19) 0px 6px 20px 0px; 148 159 } 149 160 … … 177 188 */ 178 189 179 .dark-primary-color, .panel-heading { background: #424F5A !important; color: #ffffff;} 190 /*.dark-primary-color, .panel-heading { background: #424F5A !important; color: #ffffff;}*/ 180 191 /*.dark-primary-color, .panel-heading { background: #263238 !important; color: #ffffff;}*/ 181 192 /*.default-primary-color { background: #263238 !important; color: #ffffff;}*/ … … 187 198 .secondary-text-color { color: #727272 !important; } 188 199 .divider-color { border-color: #B6B6B6 !important; } 200 201 .btn-primary { background: #03A9F4 !important; color: #ffffff !important;} 189 202 190 203 .modal-body{ -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/info.php
r1055 r2002 1 <h1 i18n>Server Info</h1>1 <h1 class="topBanner" i18n>Server Info</h1> 2 2 3 3 -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/js/main.js
r1525 r2002 228 228 229 229 $(".menuitem").bind("click", function(){ 230 230 231 var target=$(this).attr("target"); 232 231 233 var parentModule=$(this).attr("module"); 232 234 233 235 // Send hiden event to any module different than target 234 236 $(".moduleWindow:not(#"+target+")").trigger("componentHidden"); 237 238 // Checking if is info... 239 if (target=="info") { 240 $("#info").show(); 241 return 1; 242 }; 235 243 236 244 // 1st: Is a component or a module? -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/lib/utils.js
r1893 r2002 257 257 $(modalbody).append(modallog); 258 258 259 var modalProgressContainer=$(document.createElement("div")).addClass("progress-container ").attr("id", "progress-container");260 var modalProgress=$(document.createElement("div")).addClass("progress-bar ").attr("id", "modal-progress-bar").css("width", "0%");259 var modalProgressContainer=$(document.createElement("div")).addClass("progress-container progress progress-striped active").attr("id", "progress-container").css({"height":"32px", "background":"rgba(0,0,0,0)"}); 260 var modalProgress=$(document.createElement("div")).addClass("progress-bar progress-bar-info").attr("id", "modal-progress-bar").css({"width":"0%", "height":"24px"}); 261 261 $(modalProgressContainer).append(modalProgress); 262 262 … … 363 363 percent=progress_array[progress_array.length-1]; 364 364 $("#modal-progress-bar").css("width", percent).html(percent); 365 if (percent=="100%") { 366 $("#progress-container").removeClass("active"); 367 $("#modal-progress-bar").removeClass("progress-bar-info").addClass("progress-bar-success"); 368 $("#modal-progress-bar").html(self._("100% -- FINISHED --")); 369 370 $("#logviewer_btStop").removeClass("btn-primary").addClass("btn-success"); 371 $("#logviewer_btStop").off("click"); 372 373 374 /* 375 *NOT SUPPORTED... LOG FILE IS NOT COMPLETE AT ALL... 376 // Prepare window for download log 377 var targetTask=$("#logviewer_btStop").attr("targetjob"); 378 var taskid=targetTask.substring("6",targetTask.length); 379 380 self.n4d([sessionStorage.username , sessionStorage.password], 381 "TaskMan", 382 "prepareLogForDownload", 383 [taskid], 384 function(response){ 385 if (response.status) { 386 var link="logs/"+response.file; 387 $("#logviewer_btStop").html("<a href='"+link+"'>Download Log</a>"); 388 } 389 });*/ 390 391 } 365 392 } else { 366 393 // Or add text to log … … 399 426 400 427 401 UtilsClass.prototype.n4d=function n4d(credentials, n4dclass, n4dmethod, arglist, callback ){428 UtilsClass.prototype.n4d=function n4d(credentials, n4dclass, n4dmethod, arglist, callback, timeout=1){ 402 429 var self=this; 403 430 … … 430 457 data: { 431 458 method: n4dmethod, 432 args: JSON.stringify(n4dargs)}, 459 args: JSON.stringify(n4dargs), 460 timeout: timeout}, 433 461 //args: n4dargs}, 434 462 success: function(ret){ -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/login.php
r1512 r2002 3 3 4 4 <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css"> 5 <!--link rel="stylesheet" href="lib/bootstrap/css/bootstrap-theme.min.css"--> 5 6 <!--link rel="stylesheet" href="lib/bootstrap-design/css/material.min.css"--> 7 <link rel="stylesheet" href="lib/bootstrap-material-design/css/bootstrap-material-design.min.css"> 8 <link rel="stylesheet" href="lib/bootstrap-material-design/css/ripples.min.css"> 9 <!--link rel="stylesheet" href="lib/bootstrap-material-design/css/material-fullpalette.min.css"--> 10 <link rel="stylesheet" href="lib/snackbar/snackbar.css"> 11 <!--link rel="stylesheet" href="lib/bootstrap-design/css/ripples.min.css"--> 12 <!--link rel="stylesheet" href="lib/material/css/ripples.min.css"--> 13 <!--link rel="stylesheet" href="lib/bootstrap-design/css/roboto.min.css"--> 14 <link rel="stylesheet" href="lib/bootstrap-material-design/css/material-custom.css"> 15 <link rel="stylesheet" href="css/main.css"> 6 16 7 <link rel="stylesheet" href="lib/bootstrap-design/css/material.min.css">8 < link rel="stylesheet" href="lib/bootstrap-design/css/material-fullpalette.min.css">9 < link rel="stylesheet" href="lib/snackbar/snackbar.css">10 < link rel="stylesheet" href="lib/bootstrap-design/css/ripples.min.css">11 < link rel="stylesheet" href="lib/bootstrap-design/css/roboto.min.css">12 17 18 <!--jquery --> 19 <script type="text/javascript" src="lib/jquery/jquery.js"></script> 20 <!--script type="text/javascript" src="lib/jquery-ui/js/jquery-ui-1.10.4.custom.js"></script--> 21 <!--script type="text/javascript" src="lib/jquery.xmlrpc.js"></script--> 22 13 23 <!--Utilities --> 14 24 <script type="text/javascript" src="lib/waitwin.js"></script> 15 25 <script type="text/javascript" src="lib/utils.js"></script> 16 17 <!--jquery -->18 <script type="text/javascript" src="lib/jquery-2.1.0.min.js"></script>19 <!--script type="text/javascript" src="lib/jquery-ui/js/jquery-ui-1.10.4.custom.js"></script-->20 <script type="text/javascript" src="lib/jquery.xmlrpc.js"></script>21 26 22 27 … … 25 30 26 31 <!-- Material Design --> 27 <script type="text/javascript" src="lib/bootstrap-design/js/ripples.min.js"></script> 28 <script type="text/javascript" src="lib/bootstrap-design/js/material.min.js"></script> 32 <!--script type="text/javascript" src="lib/bootstrap-design/js/ripples.min.js"></script--> 33 <script type="text/javascript" src="lib/bootstrap-material-design/js/ripples.min.js"></script> 34 <!--script type="text/javascript" src="lib/bootstrap-design/js/material.min.js"></script--> 35 <script type="text/javascript" src="lib/bootstrap-material-design/js/material.min.js"></script> 29 36 30 37 … … 75 82 76 83 77 <div style="margin-top: 10px; margin-left: 100px;"> 84 <!--div style="margin-top: 10px; margin-left: 100px;"--> 85 <div style="float:right;"> 78 86 <button id="LoginButton" class="btn btn-primary btn-lg" value="<?php gt("login");?>"></button> 79 87 </div> -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/main.php
r1609 r2002 12 12 /* Setting layout */ 13 13 echo ("<body>"); 14 writeTop(); // Drawing layout header15 writeMenu($modules); // Drawing menus14 //writeTop(); // Drawing layout header 15 WriteMenu($modules); // Drawing menus 16 16 17 17 writeModulesContainers($modules); … … 83 83 function importCommonLibraries(){ 84 84 echo ('<!-- Common Libraries -->'); 85 echo ('<script type="text/javascript" src="lib/jquery -2.1.0.min.js"></script>');86 echo ('<script type="text/javascript" src="lib/jquery.xmlrpc.js"></script>');85 echo ('<script type="text/javascript" src="lib/jquery/jquery.js"></script>'); 86 //echo ('<script type="text/javascript" src="lib/jquery.xmlrpc.js"></script>'); 87 87 88 88 echo ('<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js"></script>'); 89 echo ('<script type="text/javascript" src="lib/bootstrap- design/js/ripples.min.js"></script>');90 echo ('<script type="text/javascript" src="lib/bootstrap- design/js/material.min.js"></script>');89 echo ('<script type="text/javascript" src="lib/bootstrap-material-design/js/ripples.min.js"></script>'); 90 echo ('<script type="text/javascript" src="lib/bootstrap-material-design/js/material.min.js"></script>'); 91 91 echo ('<script type="text/javascript" src="lib/snackbar/snackbar.min.js"></script>'); 92 92 echo ('<script type="text/javascript" src="lib/bootbox.min.js"></script>'); … … 127 127 <!-- Common Styles --> 128 128 <meta charset="UTF-8"> 129 130 131 132 133 134 135 136 137 129 138 <link rel="stylesheet" href="css/sidebar-menu.css"> 130 139 <link rel="stylesheet" href="lib/material-icons/material_icons.css"> 140 <!--link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css"--> 131 141 <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css"> 132 <link rel="stylesheet" href="lib/bootstrap-design/css/ripples.min.css"> 133 <link rel="stylesheet" href="lib/bootstrap-design/css/material.min.css"> 142 <link rel="stylesheet" href="lib/bootstrap-material-design/css/bootstrap-material-design.min.css"> 143 <!--link rel="stylesheet" href="lib/bootstrap-design/css/ripples.min.css"--> 144 <link rel="stylesheet" href="lib/bootstrap-material-design/css/ripples.min.css"> 145 <!--link rel="stylesheet" href="lib/bootstrap-design/css/material.min.css"--> 134 146 <link rel="stylesheet" href="lib/snackbar/snackbar.css"> 135 <link rel="stylesheet" href="lib/jquery-ui/jquery-ui.css"> 147 148 <link rel="stylesheet" href="lib/jquery-ui/jquery-ui.css"> 136 149 <link rel="stylesheet" href="css/main.css"> 137 150 <link rel="stylesheet" href="css/waitwin.css"> 138 <!--link rel="stylesheet" href="lib/bootstrap-design/css/material-fullpalette.min.css"--> 151 <link rel="stylesheet" href="lib/bootstrap-material-design/css/material-custom.css"> 152 139 153 140 154 … … 150 164 <div id="sidebar_header"></div> 151 165 <ul class="sidebar-nav nav-pills nav-stacked" id="menu"> 166 <!-- Main page link --> 167 <!--li><a class='menuitem' onclick="window.location.reload();"--> 168 <li><a class='menuitem' target='info'> 169 <span class='fa-stack fa-lg pull-left'><div class='moduleIcon' style='background-image:url(icons/default.png)'></div> 170 </span>Home</a> 171 172 152 173 <?php 153 174 foreach($modules as $key=>$value){ … … 188 209 ?> 189 210 </ul> 190 <div id="sidebar_module_description_div" class="menuitem"> 211 212 <span i18n id='bt_logout'> 213 <span style="display: inline"><i title="Logout" class="material-icons moduleIcon" style="display:inline;">power_settings_new</i></span> 214 </span> 215 216 217 <!--div id="sidebar_module_description_div" class="menuitem"> 191 218 <span id="sidebar_module_description_image" class="fa-stack fa-lg pull-left"><div class="moduleIcon" style="background-image:url(modules/lliurex-guard/src/icons/guard_flat.png)"></div></span> 192 <!--span >Pajaritos tralari... esto es la descvripción del modulo...</span-- >219 <!--span >Pajaritos tralari... esto es la descvripción del modulo...</span-- > 193 220 <span id="sidebar_module_description_text">Pajaritos tralari... esto es la descvripción del modulo...</span> 194 221 </span> 195 </div >222 </div--> 196 223 </div> 197 224 </div> -
admin-center/trunk/fuentes/admin-center.install/usr/share/admin-center/n4d.php
r1512 r2002 29 29 } 30 30 31 function n4d($method, $args ){31 function n4d($method, $args, $timeout){ 32 32 33 33 writeHeader(); … … 45 45 curl_setopt($ch, CURLOPT_POSTFIELDS, $request); 46 46 47 curl_setopt($ch, CURLOPT_FRESH_CONNECT, true); // async 48 curl_setopt($ch, CURLOPT_TIMEOUT, 1); // async 47 48 if ($timeout!="0"){ 49 error_log("**************************************************************"); 50 curl_setopt($ch, CURLOPT_FRESH_CONNECT, true); // async 51 curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); // async 52 } 49 53 50 54 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); … … 56 60 curl_close($ch); 57 61 58 error_log(curl_errno($ch)); 62 //error_log($data); 63 //error_log(curl_errno($ch)); 59 64 if (curl_errno($ch)) { 60 65 $xml_snippet=simplexml_load_string($data); … … 63 68 } else { 64 69 $xmlobj=xmlrpc_decode($data); 70 71 error_log($xmlobj); 72 65 73 $json=json_encode($xmlobj); 66 74 var_error_log($data); … … 69 77 if ($json=="") { 70 78 $json=$xmlobj;} 79 //error_log($json); 71 80 var_error_log($json); 72 81 echo ($json); … … 90 99 $method=$_POST["method"]; 91 100 $args=json_decode($_POST["args"]); 101 $timeout=$_POST["timeout"]; 92 102 $myfile = fopen("/tmp/n4dlog","a"); 93 103 fwrite($myfile,$method); … … 100 110 else $log="false"; 101 111 102 n4d($method, $args );112 n4d($method, $args, $timeout); 103 113 //$n4d_async = new n4dAsync(); 104 114 //$n4d_async ->start($method, $args); -
admin-center/trunk/fuentes/admin-center.install/usr/share/n4d/python-plugins/RemoteWebGui.py
r1055 r2002 50 50 51 51 52 def create_connection(self, xephyr_options=" -ac -terminate -screen 1024x768"):52 def create_connection(self, username, xephyr_options=" -ac -terminate -screen 1024x768 -dpi 96 "): 53 53 # Cal afegir com a parametre el username i que retorne el port.... 54 54 try: 55 os.environ["HOME"]="/home/ lliurex";56 os.environ["XAUTHORITY"]="/home/ lliurex/.Xauthority";55 os.environ["HOME"]="/home/"+username; 56 os.environ["XAUTHORITY"]="/home/"+username+"/.Xauthority"; 57 57 58 58 display=self.get_first_display_free() 59 59 port=self.get_first_free_port(); 60 60 61 print "PORT: ",port," DISPLAY: ",display 62 61 63 xephyr_cmd="Xephyr "+xephyr_options+" "+display; 62 xpra_cmd="xpra start --bind-tcp=0.0.0.0:"+str(port)+" --html=on --no-pulseaudio --exit-with-children --start-child='"+xephyr_cmd+"'"; 64 #xephyr_cmd="Xnest -ac -geometry 800x600+24 "+display; 65 xpra_cmd="xpra start --bind-tcp=0.0.0.0:"+str(port); 66 xpra_cmd=xpra_cmd+" --html=on --no-pulseaudio --exit-with-children --start-child='"+xephyr_cmd+"'"; 63 67 print "Exec: "+xpra_cmd; 68 p=subprocess.call([xpra_cmd], shell=True); 64 69 65 p=subprocess.call([xpra_cmd], shell=True); 70 # PROVAR ASO EN ALTRE LLOC O MIRAR X Q NO VA 71 # https://xpra.org/trac/wiki/Usage 72 #xpra_cmd2="xpra attach tcp:0.0.0.0:"+str(port)+" --border=black,0 --window-close=ignore --desktop-scaling=auto"; 73 #print "bbbbbbbbbb" 74 #p2=subprocess.call([xpra_cmd2], shell=True); 75 #print "cccccccccccccc" 76 66 77 67 78 # wait for port is listening … … 73 84 74 85 print "port "+str(port)+" is available with status: "+str(status); 75 return {'port':str(port), 'display':display}; 86 #sleep (2) 87 return {"status":True, "msg":{"port":str(port), "display":display}}; 76 88 77 89 except Exception as e: 78 print e79 return -190 print "[RemoteWebGui] create_connection Exception: ",e 91 return {'status':False, 'msg': str(e)} 80 92 81 return 093 return {'status':False, 'msg': 'unknown'} 82 94 83 95 #def remote_execute … … 90 102 print e 91 103 return -1 92 93 104 105 return 0 94 106 95 107 … … 104 116 return -1 105 117 106 118 return 0 107 119 108 120 -
admin-center/trunk/fuentes/admin-center.install/usr/share/n4d/python-plugins/TaskMan.py
r1869 r2002 8 8 #import tempfile 9 9 10 #import os10 import os 11 11 #import signal 12 #import shutil 12 import shutil 13 import ntpath 13 14 14 15 … … 100 101 101 102 103 def prepareLogForDownload(self, taskid): 104 ''' 105 Copies task status from /run/taskmanager/pipe_XXX corresponding to taskid to admincenter/logs 106 ''' 107 try: 108 pipe=self.tasks[taskid].getFilePipe(); 109 if not os.path.exists("/tmp/taskslog"): 110 os.makedirs("/tmp/taskslog") 111 shutil.copy(pipe, "/tmp/taskslog/"); 112 113 return {"status":True, "file":ntpath.basename(pipe)} 114 115 except Exception as e: 116 return {"status": False, "msg":str(e)} 117 118 102 119 def cancelTask(self, taskid): 103 120 print "REMOVING ", str(taskid) -
admin-center/trunk/fuentes/debian/admin-center.postinst
r1055 r2002 8 8 LINK_NAME="/var/www/admin-center" 9 9 APP_NAME="/usr/share/admin-center" 10 LOGS_DIR="/tmp/taskslog" 10 11 N4D_CERT_PATH="/etc/n4d/cert/n4dcert.pem" 11 12 N4D_CERT_LINK="${APP_NAME}/n4dcert.pem" … … 16 17 ln -s ${APP_NAME} ${LINK_NAME} || true 17 18 ln -s ${N4D_CERT_PATH} ${N4D_CERT_LINK} || true 19 ln -s ${LOGS_DIR} ${APP_NAME}/logs || true 18 20 19 21 if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then -
admin-center/trunk/fuentes/debian/changelog
r1893 r2002 1 admin-center (0.5.2) xenial; urgency=high 2 3 * Updated libraries 4 * Fixed n4d curl call with timeout and syncronous 5 * Customized material 6 7 -- joamuran <joamuran@gmail.com> Thu, 23 Jun 2016 17:22:50 +0200 8 1 9 admin-center (0.5.1) xenial; urgency=high 2 10
Note: See TracChangeset
for help on using the changeset viewer.