CDPP / AMDA_IHM

Commit 1e106ce5686795856ea1d771a08c4ffdb6da3246

Authored by Nathanaël Jourdane
2 parents 55748a3e 41fbf0bd
Exists in master and in 108 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, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, 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

Merge branch 'master' of gitlab1.irap.omp.eu:CDPP/AMDA_IHM

Showing 2 changed files with 25 additions and 5 deletions   Show diff stats
Inline Side-by-side
js/resources/css/styles.css
  Diff comments   View file @1e106ce
... ... @@ -47,6 +47,16 @@ padding-top: 20px;
47 47 background: #F6F3E7;
48 48 }
49 49  
  50 +#main2
  51 +{
  52 +width: 710px;
  53 +height: 750px;
  54 +padding: 10px;
  55 +padding-top: 20px;
  56 +/*background: #ffffff; */
  57 +background: #F6F3E7;
  58 +}
  59 +
50 60 #back
51 61 {
52 62 width: 738px;
... ... @@ -60,16 +70,17 @@ width: 738px;
60 70  
61 71 #right H3
62 72 {
63   -width: 210px;
  73 +width: 160px;
64 74 height: 29px;
65 75 font-size: 14px;
66 76 font-weight: bold;
67 77 padding-left: 0px;
68 78 padding-top: 10px;
69 79 text-transform: uppercase;
  80 +text-decoration: underline;
70 81 color: #555555;
71 82 text-align: center;
72   -background: url(../images/right.png) no-repeat;
  83 +/*background: url(../images/test.png) no-repeat; */
73 84 }
74 85  
75 86 #right H4
... ...
php/RemoteDataCenter/getRemoteDDBaseProxies.php
  Diff comments   View file @1e106ce
... ... @@ -47,12 +47,13 @@
47 47  
48 48 $basesRemote = $basesDomRemote->getElementsByTagName("dataCenter");
49 49 foreach ($basesRemote as $baseRemote) {
  50 +
50 51 $baseId = $baseRemote->getAttribute("xml:id");
51   -
  52 + $baseDir = DATAPATH."/RemoteData/$baseId";
  53 + $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId";
  54 +
52 55 // add remote base if it doesn't exist
53 56 if (!$basesDom->getElementById($baseId)) {
54   - $baseDir = DATAPATH."/RemoteData/$baseId";
55   - $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId";
56 57 if (!is_dir($baseDir)) mkdir($baseDir, 0775, true);
57 58 chmod($baseDir,0775);
58 59 if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) {
... ... @@ -67,6 +68,14 @@
67 68 $center->makeAllParams();
68 69 }
69 70 }
  71 + }// just copy base xml
  72 + else {
  73 + if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) {
  74 + echo "Cannot copy base.xml for $baseId".PHP_EOL;
  75 + }
  76 + else {
  77 + echo "Copied base.xml for $baseId".PHP_EOL;
  78 + }
70 79 }
71 80 }
72 81 }
... ...