Merge branch 'split_view_10094' into split_view_merge

Conflicts: components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
ome · Mar 21, 2013 · 75b7227 · 75b7227
2 parents efbaa9f + 88f2f3c
commit 75b7227
Show file tree

Hide file tree

Showing 18 changed files with 1,106 additions and 135 deletions.
diff --git a/components/tools/OmeroWeb/omeroweb/webclient/controller/container.py b/components/tools/OmeroWeb/omeroweb/webclient/controller/container.py
@@ -177,6 +177,29 @@ def getPlateId(self):
         elif self.acquisition:
             return self.acquisition._obj.plate.id.val
 
+
+    def listFigureScripts(self, objDict=None):
+        """
+        This configures all the Figure Scripts, setting their enabled status given the
+        currently selected object (self.image etc) or batch objects (uses objDict).
+        """
+        figureScripts = []
+        # id is used in url and is mapped to full script path by views.figure_script()
+        splitView = {'id': 'SplitView', 'name':'Split View Figure', 'enabled': False,
+            'tooltip': "Create a figure of images, splitting their channels into separate views"}
+        # Split View Figure is enabled if we have at least one image with SizeC > 1
+        if self.image:
+            splitView['enabled'] = (self.image.getSizeC() > 1)
+        elif objDict is not None:
+            if 'image' in objDict:
+                for i in objDict['image']:
+                    if i.getSizeC() > 1:
+                        splitView['enabled'] = True
+                        break
+        figureScripts.append(splitView)
+        return figureScripts
+
+
     def openAstexViewerCompatible(self):
         """
         Is the image suitable to be viewed with the Volume viewer 'Open Astex Viewer' applet?

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css b/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css
@@ -136,6 +136,7 @@ button::-moz-focus-inner {
 	.btn_group {background: url(../../webgateway/img/icon_add_group.png )center center no-repeat;}
 	.btn_delete {background: url(../../webgateway/img/icon_delete.png )center center no-repeat;}
 	.btn_edit {background: url(../../webgateway/img/icon_edit.png )center center no-repeat;}
+	.btn_figscripts {background: url(../../webgateway/img/icon_figure_scripts.png) center center no-repeat;}
 	.btn_fspath {background: url(../../webgateway/img/icon_fs_path.png )center center no-repeat;}
 	.btn_link {background: url(../../webgateway/img/icon_link.png )center center no-repeat;}
 
@@ -163,7 +164,7 @@ button::-moz-focus-inner {
 	    display:block;
 	}
 
-    #general_tab .btn_download span {
+    .toolbar_dropdown .btn span {
         width:20px;
         height:18px;
         display:block;
@@ -173,6 +174,7 @@ button::-moz-focus-inner {
         background: url(../../webgateway/img/icon_download2.png) center center no-repeat;
     }
 
+/*<<<<<<< HEAD
     #download_dropdown .dropdown {
         right: 0px;
         left: auto;
@@ -182,9 +184,20 @@ button::-moz-focus-inner {
         margin-left: 5px;
     }
     #download_dropdown .dropdown:before {
+=======*/
+    .toolbar_dropdown {
+        float:right;
+        margin: 0px 5px 0px 0px;
+        position: relative;
+    }
+    .toolbar_dropdown .dropdown {
+        right: -35px;
+        left: auto;
+    }
+    .toolbar_dropdown .dropdown:before {
         left: 68% !important;
     }
-    #download_dropdown ul a {
+    .toolbar_dropdown ul a {
         background: none;
         font-size: 80%;
     }
@@ -406,7 +419,7 @@ button::-moz-focus-inner {
 			}
 
 			.btn_text span {
-				padding:6px 10px !important;
+				padding:3px 7px !important;
 			}
 
 
@@ -487,7 +500,7 @@ button::-moz-focus-inner {
 	width:12px;
 	height:12px;
 	position:absolute;
-	z-index:99;
+	z-index:90;
 	right:5px;
 	top:5px;
 	-webkit-border-radius:20px;

diff --git a/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css b/components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css
@@ -534,7 +534,7 @@
     /* Right Inner Content */
 
     .right_tab_inner {
-		padding:15px;
+        padding:10px 15px;
         overflow: auto;
         top:6px ;bottom:0px; left:0px; right:0px;
         position: absolute;
@@ -549,7 +549,7 @@
     /* Seperator */
 
     hr {
-        margin:15px 0;
+        margin:10px 0;
         display:block;
         border:none;
         border-bottom: solid 1px rgba(255,255,255,.8);
@@ -588,7 +588,7 @@
 
 
 	.data_heading {
-		margin-bottom:20px;
+		margin-bottom:15px;
 		border-bottom:solid 1px hsl(210,10%,90%);
 		overflow:hidden;
 		-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5);
@@ -597,7 +597,7 @@
 		   -moz-box-shadow:0 1px 0  rgba(255,255,255,.5); /* FF3.5+ */
 		        box-shadow:0 1px 0  rgba(255,255,255,.5); /* Opera 10.5, IE 9.0 */
 
-		padding:10px 0;
+		padding:10px 0 5px 0;
 	}