CDPP / AMDA_IHM

Commit f2f6c6967bbd33bad3831001623c783432e14f9a

Authored by Elena.Budnik
2 parents 9ced131c 37f1898e
Exists in alias

Merge branch 'master' into alias

Showing 3 changed files with 61 additions and 7 deletions   Show diff stats
Inline Side-by-side
index_warning.html 0 → 100644
  Diff comments   View file @f2f6c69
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
  1 +<!DOCTYPE HTML>
  2 +<html>
  3 +<head>
  4 +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  5 +<title>Welcome on Amda</title>
  6 +<link href="js/resources/css/AccueilAmda.css" rel="stylesheet" type="text/css">
  7 +<!-- Login -->
  8 +<link rel="stylesheet" type="text/css" href="js/resources/css/login.css" />
  9 +<link rel="icon" href="favicon.ico" type="image/x-icon">
  10 +<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
  11 +</head>
  12 +
  13 +<body>
  14 +<div id="centrage">
  15 +
  16 +<div id="trou">
  17 +
  18 +<div id="couvercle"></div>
  19 +
  20 +<div id="TousLesBoutons">
  21 +<div id="Btn_FirstVisit" onclick="location.href='help.html';"></div>
  22 +<div id="Btn_Rules" onclick="location.href='help/policy.html';"></div>
  23 +<form method="POST" action="desktop.php">
  24 + <input type="text" name="username" placeholder="LOGIN" id="Btn_EnterLogin" class="PlaceHolder" />
  25 + <input type="password" name="password" placeholder="PASSWORD" id="Btn_EnterPassword" class="PlaceHolder"/>
  26 + <div><input id="Btn_Login" type="submit" value=""/></div>
  27 +</form>
  28 +<a href="mailto:amda@irap.omp.eu?subject=AMDA registration" id="Btn_Register"></a>
  29 +<a href="mailto:amda@irap.omp.eu?subject=AMDA contact" id="Btn_Contact"></a>
  30 +<div id="Btn_About" onclick="location.href='help/info.html';"></div><div id="textAbout">AMDA Info</div>
  31 +<a href="http://www.cdpp.eu/" id="Logo_CDPP"></a>
  32 +<div id="PaveGuest">
  33 +<div id="TitrePaveGuest">Try AMDA as a guest</div>
  34 +<div id="TextePaveGuest">login: guest</div>
  35 +<div id="TextePaveGuest">password : your e-mail address</div>
  36 +</div>
  37 +<div id="Logos_partenaires"></div>
  38 +
  39 +<div id="PaveAnnoucements">
  40 +<div id="TitrePaveAnnoucement">Announcements </div>
  41 +<div id="DateAnnoucementRed">26/04/2019</div><div id="TexteAnnoucementRed">AMDA is temporary out of service<br/>Sorry for the inconvenience.</div>
  42 +<div id="DateAnnoucement">09/07/2018</div>
  43 +<div id="TexteAnnoucement">New instance :</div>
  44 +<div id="TexteAnnoucement">New plot module with more complete options</div>
  45 +<div id="TexteAnnoucement">New analysis functionalities: statistics, catalogues</div>
  46 +<div id="TexteAnnoucement">New data: JUNO, EISCAT, DSCVR</div>
  47 +<div id="TexteAnnoucement">Access to <a href="http://amda-old.cdpp.eu" target="_blank">old version</a></div>
  48 +</div>
  49 +
  50 +</div><!--TousLesBoutons-->
  51 +</div><!--trou-->
  52 +</div><!--centrage-->
  53 +</body>
  54 +</html>
js/app/views/DownloadUI.js
  Diff comments   View file @f2f6c69
@@ -459,6 +459,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, { @@ -459,6 +459,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
459 } 459 }
460 break; 460 break;
461 case 'alias' : 461 case 'alias' :
  462 + // console.log(data.records[0].data);
462 idToSent = "#" + data.records[0].get('text'); 463 idToSent = "#" + data.records[0].get('text');
463 break; 464 break;
464 case 'derivedParam' : 465 case 'derivedParam' :
@@ -481,7 +482,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, { @@ -481,7 +482,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
481 } 482 }
482 break; 483 break;
483 case 'myDataParam' : 484 case 'myDataParam' :
484 - idToSent = "ws_" + data.records[0].get('text'); 485 + idToSent = "wsd_" + data.records[0].get('text');
485 break; 486 break;
486 default : 487 default :
487 return false; 488 return false;
update_amda/generate_param_info
  Diff comments   View file @f2f6c69
@@ -49,11 +49,10 @@ if [ ! -e ./app.properties ]; then @@ -49,11 +49,10 @@ if [ ! -e ./app.properties ]; then
49 exit 49 exit
50 fi 50 fi
51 51
52 -# if [ -e ./app.properties.temp ]; then  
53 -# # rm ./app.properties.temp  
54 -# echo "Seems ./app.properties has been modified already"  
55 -# else  
56 -# modify app.properties in any case ! 52 +if [ -e ./app.properties.temp ]; then
  53 + rm ./app.properties.temp
  54 +fi
  55 +
57 while read line 56 while read line
58 do 57 do
59 58
@@ -78,7 +77,7 @@ while read line @@ -78,7 +77,7 @@ while read line
78 fi 77 fi
79 78
80 echo $line >> ./app.properties.temp 79 echo $line >> ./app.properties.temp
81 - 80 +
82 done < <(cat $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties) 81 done < <(cat $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties)
83 82
84 cp ./app.properties.temp $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties 83 cp ./app.properties.temp $AMDA_KERNEL_DIR/app-generate-paraminfo/app.properties