Second phase of DFL-3645, Improved same_origin indication in the ResourceTree.

Author: p01

src/resource-manager/resource_style.css

@@ -203,6 +203,10 @@
 {
   padding:8px;
 }
+.resource-detail-image-container
+{
+  text-align:center;
+}
 .resource-detail-error
 {
   color:red;
@@ -250,12 +254,6 @@ a.external:hover
 }
 
 
-/* ---------- */
-.resource-different-origin
-{/* note: same color as the .string class */
-  color:#a54;
-}
-
 /* ------------------ */
 .resource-tree
 {
@@ -315,6 +313,7 @@ span.resource-domain
 {
   color:#999;
 }
+
 span.resource-tree-window-label,
 span.resource-tree-document-label,
 span.resource-tree-group-label

src/resource-manager/resource_templates.js

@@ -137,7 +137,9 @@ templates.resource_tree =
 						'('+resources.length+')',
 						'class','resource-tree-count'
 					],
-					'class','resource-tree-document'+(d.sameOrigin?'':' resource-different-origin')
+					' ',
+					d.sameOrigin?[]:['span',d.url.host,'class','resource-domain'],
+					'class','resource-tree-document',
 				].concat( extras.tpl.h2 ),
 				( resources.length == 0 || extras.collapsed )?[]:
 				[
@@ -214,33 +216,21 @@ templates.resource_tree =
 
 	resource:function(context, depth, r)
 	{
-		var resourceName =
-		[
-			'span',
-			(r.filename || r.short_distinguisher || r.url || 'NO URL'),
-			'class','resource-tree-resource-label',
-			'style', 'margin-left:'+ (1+depth)*this.DEPTH_IDENTATION +'px;',
-			'data-tooltip','js-script-select',
-			'data-tooltip-text',r.url
-		];
 		var tpl =
 			['li',
 				['h2',
-					(
-						r.sameOrigin
-						?
-						resourceName
-						:
-						[resourceName,' ',
-						['span',
-						'('+r.host+')',
-						'class','resource-domain'
-					]]),
-
+					['span',
+						(r.filename || r.short_distinguisher || r.url || 'NO URL'),
+						'class','resource-tree-resource-label',
+						'style', 'margin-left:'+ (1+depth)*this.DEPTH_IDENTATION +'px;',
+						'data-tooltip','js-script-select',
+						'data-tooltip-text',r.url
+					],
+					' ',
+					r.sameOrigin?[]:['span',r.host,'class','resource-domain'],
 					'handler','resource-detail',
 					'data-resource-uid',String(r.uid),
 					'class','resource-tree-resource'
-//						+(r.sameOrigin?'':' resource-different-origin')
 						+(context.selectedResourceUID==r.uid?' resource-highlight':'')
 				]
 			];