Merge branch 'master' into plot-tt-catalog

Benjamin Renard
2 parents 684bfc1c f5aaaec9
Showing 7 changed files with 11 additions and 331 deletions Show diff stats
generic_data/operations.json
js/app/models/PlotNode.js
js/app/views/PlotComponents/PlotStandardForm.js
js/resources/css/FisheyeMenu.css
js/resources/css/amda.css
js/resources/css/styles.css
js/resources/css/styles2.css
 {"nodes": [
-  {"nodeType" : "request", "text" : "Plot / Download", "id" :  "request-treeRootNode"} ,    
+  {"nodeType" : "request", "text" : "Plot", "id" :  "request-treeRootNode"} ,    
   {"nodeType" : "condition","text" : "Data Mining","id" : "condition-treeRootNode" }
 ]}
@@ -5,12 +5,6 @@
  * @extends amdaModel.ExecutableNode
  * @brief   Basic Model of Node corresponding to a plot request
  * @author  Benjamin Renard
- * @version $Id: $
- * @todo
- *******************************************************************************
- *    FT Id     :   Date   : Name - Description
- *******************************************************************************
- *  :           :21/08/2015: BRE  - file creation
  */
  
 Ext.define('amdaModel.PlotNode', {
@@ -45,9 +39,6 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
             fnId : 'leaf-editPlot',
             text : 'Plot By Request'
          }, {
-            fnId : 'leaf-editDownload',
-            text : 'Download By Request'
-         }, {
              fnId : 'leaf-renameNode',
              text : 'Rename Request'
          }, {
@@ -77,7 +68,7 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
     },
  
     onMenuItemClick : function(menu,item,event) {
-        // fnId parsing :
+		 
         var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
  
         switch (fnId) {
@@ -97,19 +88,6 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
         case 'editPlot':     
             this.editLeaf(); 
             break;
-        
-        case 'editDownload':
-	    amdaModel.DownloadNode.set('realLinkedNode',this);
-	    
-	    if (!this.get('object')){
-			AmdaAction.getObject(this.get('id'), this.get('nodeType'), amdaModel.DownloadNode.getObjectCallback, this);
-		    }
-		    else {	      
-		      var downObject = amdaModel.DownloadNode.decodeObject();
-		      amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
-		      amdaModel.DownloadNode.editInModule();
-		    }
-		    break;
  
         case 'deleteMulti':
             this.deleteMulti();
@@ -117,7 +95,7 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
  
         default:
             break;
-        } // switch end
+        }
     }
  
 });
@@ -160,6 +160,7 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
 	addStandardFieldSet: function(title, checkboxName, items, onChangeCheck) {
 		return {
         	xtype: 'fieldset',
+			cls : 'child-fieldset',
         	title: title,
         	collapsible: true,
         	collapsed: true,
@@ -1,62 +0,0 @@
-/* styles for CSS Reset */
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote{margin:0;padding:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;}
-
-/* styles for examples */
-body {
-	background-color: #DFE8F6;
-}
-
-#fisheye-menu {
-	text-align: center;
-}
-
-/* styles for FisheyeMenu */
-.ux-fisheye-menu-container {
-	position: absolute;
-	height: 60px;
-}
-
-a.ux-fisheye-menu-item {
-	display: block;
-	font: bold 12px Arial, Helvetica, sans-serif;
-	width: 40px;
-	color: #000;
-	position: absolute;
-	text-align: center;
-	text-decoration: none;
-	border: none;
-}
-
-a.ux-fisheye-menu-item span {
-	margin-bottom: 5px;
-	border: none;
-	color: #FFF;
-	display: none;
-	text-align: center;
-	text-decoration: none;
-}
-
-a.ux-fisheye-menu-item img {
-	border: none;
-	margin-right: 10px;
-	width: 100%;
-	text-decoration: none;
-}
-
-.menu-wrap-top {
-	position: relative;
-}
-.menu-wrap-bottom {
-	position: absolute;
-	width: 100%;
-	bottom: 35px;
-}
-
-.menu-align-top {
-	top: 0;
-	bottom: auto;
-}
-.menu-align-bottom {
-	bottom: 0;
-	top: auto;
-}
 \ No newline at end of file
@@ -2,15 +2,18 @@
  
 /* Safari 11  fieldset collapse/expose bug */
 .x-fieldset {
-	overflow : visible;
+	overflow : visible !important;
 }
-	
+
+.child-fieldset {
+	background-color: #f8f6ee;  
+}
+
 .window-active .x-window-header {
-	background-color:#6c0985;
+	background-color: #6c0985;
 }
  
 .window-active .x-window-header-text {
-/*	color: #08d5c9; */
 	color: #cafdff;
 }
  
@@ -1,206 +0,0 @@
-/*
-Design by Metamorphosis Design
-http://www.metamorphozis.com
-Released for free under a Creative Commons Attribution 2.5 License
-*/
-
-*
-{
-margin: 0px;
-padding: 0px;
-}
-
-a:link {
-	color: #A5A9B2;
-}
-
-a:hover {
-	text-decoration: none;
-	color: #FF0000;
-}
-
-a:visited {
-	color: #A5A9B2;
-}
-
-body {
-	
-	background: url(../images/ciel10.jpg) ;
-	font: 13px Arial, Helvetica, sans-serif;
-	color: #555555;
-	margin-top: 20px;
-}
-
-#content
-{
-	width: 738px;
-	margin: 0px auto;
-}
-
-#main
-{
-width: 710px;
-height: 320px;
-padding: 10px;
-padding-top: 20px;
-/*background: #ffffff; */
-background: #F6F3E7; 
-}
-
-#main2
-{
-width: 710px;
-height: 830px;
-padding: 10px;
-padding-top: 20px;
-/*background: #ffffff; */
-background: #F6F3E7; 
-}
-
-#back
-{
-width: 738px;
-}
- 
-#right
-{
-	width: 215px;
-	float: right;
-}
-
-#right H3
-{
-width: 160px;
-height: 29px;
-font-size: 14px;
-font-weight: bold;
-padding-left:  0px;
-padding-top: 10px;
-text-transform: uppercase;
-text-decoration: underline;
-color: #555555;
-text-align: center;
-/*background: url(../images/test.png) no-repeat; */
-}
-
-#right H4
-{
-        margin: 0;
-        padding: 0px;
-        font-size: 12px;
-        color:#555555;
-}
-
-#right ul {
-	list-style: none;
-	margin-bottom: 10px;
-	padding-top: 10px;
-}
- 
-#right li  {
-	padding: 4px;
-	padding-left: 20px;
-        padding-right: 20px;
-       
-}
- 
-
-#right a {
-	color: #6495ED;
-}
-
-#right a:hover {
-	color: #ff0000;
-}
-
-#right p
-{
-font-size: 10px;
-padding-left: 10px;
-}
-
-
-#left
-{
-width: 450px;
-margin-left: 20px;
-}
-
-#left H4
-{
-	margin: 0;
-	padding: 0px;
-	font-size: 12px;
-	color:#555555;
-}
-
-#left a
-{
-color: #6495ED;
-text-decoration: none;
-}
-
-#left a:hover
-{
-color: #FF0000;
-text-decoration: none;
-}
-
-#left p {
-	margin: 5px;
-	padding: 0;
-}
-
-#left h2 {
-	margin: 0;
-	padding: 0;
-	padding-top: 0px;
-	color: #555555;
-}
-
-#left ol, #left ul
-{
-margin-left: 30px;
-}
-
-.date {
-	text-align: left;
-	color: #555555; 
-	font-size: 10px;
-
-}
-
-.date a {
-	color: #6495ED;
-
-}
-
-
-#footer {
-	height: 50px;
-	clear: both;
-	padding-top: 1px;
-}
-
-#footer p {
-	margin: 0;
-	font-size: 10px;
-	text-align: center;
-	color: #666666;
-}
-
-#footer a {
-	color: #666666;
-}
-
-#left .news {
-
-    font-size: 13px;
-    color: #003366;
-}
-
-#left .warning {
-
-    font-size: 13px;
-    color: #880000;
-}
@@ -1,34 +0,0 @@
-/*
-Design by Metamorphosis Design
-http://www.metamorphozis.com
-Released for free under a Creative Commons Attribution 2.5 License
-*/
-
-*
-{
-margin: 0px;
-padding: 0px;
-}
-
-body {
-	
-	background: url(../images/ciel10.jpg) ;
-	font: 13px Arial, Helvetica, sans-serif;
-	color: #555555;
-	margin-top: 20px;
-}
-
-#content
-{
-	width: 1438px;
-	margin: 0px auto;
-}
-
-#main
-{
-width: 1410px;
-padding: 10px;
-padding-top: 20px;
-/*background: #ffffff; */
-background: #F6F3E7; 
-}