CDPP / AMDA_IHM

Commit e748a7f55b5a6a78f6e013e75ec7b1ecd450f19c

Authored by Benjamin Renard
2 parents 51b7c77c 45f46b61
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, livraison-akka, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Merged master fixed conflict.

Showing 4 changed files with 25 additions and 7 deletions   Show diff stats
Inline Side-by-side
desktop.php
  Diff comments   View file @e748a7f
... ... @@ -43,8 +43,8 @@
43 43  
44 44 <!-- <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
45 45 <!-- <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
46   - <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script>
47   -<!-- <script type="text/javascript" src="js/lib/ext/ext-all.js"></script> -->
  46 +<!-- <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script>-->
  47 + <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
48 48 <!-- <script type="text/javascript" src="js/lib/ext/ext-all-dev.js"> -->
49 49 <script type="text/javascript" src="js/lib/ext-override.js"></script>
50 50  
... ... @@ -105,7 +105,7 @@
105 105 var isGuest = sessionID.match('guest');
106 106  
107 107 var guestSessionDuration = '<?php echo GuestSessionDuration*60; ?>'; // in secs
108   - var maxGuestTimeInterval = '<?php echo MaxGuestTimeInterval; ?>'; // in days
  108 + var maxGuestTimeInterval = '<?php echo MaxGuestTimeInterval; ?>'; // in days
109 109  
110 110 //create mask class (LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask)
111 111 var AMDAMask = new Ext.Class({
... ...
help/releaseNotes.2.0.0 0 → 100644
  Diff comments   View file @e748a7f
... ... @@ -0,0 +1,19 @@
  1 +<h2><img src="js/resources/images/32x32/fav_amda.png"/>Welcome On New AMDA</h2>
  2 +<i>release version : alpha 2.0.0<br/>release date : 2016-05-16</i>
  3 +
  4 +<ul>
  5 + <li><img src="js/resources/images/64x64/plot.png" width=24/><i>Plot -a lot of new features,
  6 + new interface design.
  7 + Use Plot Module help ("?") to learn more
  8 + <li><img src="js/resources/images/64x64/catalog.png" width=24/> catalog
  9 + <li><img src="js/resources/images/64x64/visu_catalog.png" width=24/> catalog
  10 + <li><img src="js/resources/images/64x64/statistics.png" width=24/> Catalogs
  11 + <li><img src="js/resources/images/64x64/search.png" width=24/> data Mining
  12 + <li><img src="js/resources/images/64x64/edit.png" width=24/> my parameter
  13 + <li><img src="js/resources/images/64x64/interop.png" width=24/> inter
  14 + <li><img src="js/resources/images/64x64/download_manager.png" width=24/> down
  15 + <li><img src="js/resources/images/64x64/mydata.png" width=24/> upload
  16 + <li><img src="js/resources/images/64x64/timeTable.png" width=24/> time table
  17 + <li><img src="js/resources/images/64x64/operations.png" width=24/> time table oper
  18 + <li><img src="js/resources/images/64x64/help.png" width=24/>Help : Obsolete, TBD</i>
  19 +</ul>
... ...
js/app/controllers/InteractiveModule.js
  Diff comments   View file @e748a7f
... ... @@ -134,7 +134,7 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
134 134 show: function() {
135 135 // configuration of empty catalog
136 136 if (this.isOperationOnShow)
137   - this.operationOnShow();
  137 + Ext.Function.defer(this.operationOnShow, 2000, this);
138 138 if (onShowEvent)
139 139 onShowEvent();
140 140 }
... ...
php/amda_version.php
  Diff comments   View file @e748a7f
... ... @@ -6,6 +6,5 @@
6 6 */
7 7  
8 8 define('AMDA_VERSION','2.0.0');
9   - define('RELEASE_DATE','2016-05-12');
10   -
11   -?>
12 9 \ No newline at end of file
  10 + define('RELEASE_DATE','2016-05-16');
  11 +?>
... ...