add user correctly in sigma directive snippet

CVCEeu-dh · Feb 1, 2016 · 12c2e1b · 12c2e1b
1 parent f04409d
commit 12c2e1b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/client/src/css/style.css b/client/src/css/style.css
@@ -1330,7 +1330,7 @@ header ul li .notification a {
 }
 
 #milkyway.explore.persons, #milkyway.explore.projection, #milkyway.explore.locations{
-  left: 10px;
+  left: 0px;
   display: block
 }
 
@@ -1721,13 +1721,25 @@ height: 150px;
   background-repeat:no-repeat;
   background-position:center;
   border-radius: 50px;
+
+}
+
+.node.person .thumbnail-wrapper{
   border: 3px solid #4dc3ba;
 }
 
 .node.resource .thumbnail-wrapper{
   border: 3px solid #f6941c;
 }
 
+.node.location .thumbnail-wrapper{
+  border: 3px solid #7e213c;
+}
+
+.node.theme .thumbnail-wrapper{
+  border: 3px solid #ff9b01;
+}
+
 .node .content {
 margin-left: 50px;
     min-height: 70px;

diff --git a/client/src/js/directives/sigma.js b/client/src/js/directives/sigma.js
@@ -17,6 +17,7 @@ angular.module('histograph')
       templateUrl: 'templates/partials/helpers/sigma.html',
 
       scope:{
+        user: '=',
         graph: '=',
         tips: '=',
         controller: '=',

diff --git a/client/src/js/directives/snippets.js b/client/src/js/directives/snippets.js
@@ -16,8 +16,8 @@ angular.module('histograph')
       templateUrl: 'templates/partials/helpers/snippet.html',
       scope:{
         center: '=',
-        target: '='
-
+        target: '=',
+        user: '='
       },
       link: function(scope, elem){
         $log.log('::snippets ------------');

diff --git a/client/src/js/templates.js b/client/src/js/templates.js
diff --git a/client/src/templates/partials/helpers/sigma.html b/client/src/templates/partials/helpers/sigma.html
@@ -1,7 +1,7 @@
 <div id="playground"></div>
        <!-- <div gmasp target="target"></div> -->
         <!-- <div id="tips" ng-if="tips.length > 0"><div>{{tips}}</div></div> -->
-<div snippets id="sigma-snippets" target="target" center="center"></div>
+<div snippets user="user" id="sigma-snippets" target="target" center="center"></div>
 <div id="sigma-messenger" ng-if="message.text.length" class="animated {{message.visible? 'fadeIn': 'fadeOut'}}"><div class="inner">{{message.text}}</div></div>
 <div id="commands" class="{{lookup?'lookup':''}}">
   <div tooltip="view all nodes" tooltip-append-to-body="true" class="action {{lookup? 'bounceIn animated': 'hidden'}}" ng-click="toggleLookup()"><i class="fa fa-eye"></i></div>

diff --git a/client/views/index.jade b/client/views/index.jade
@@ -124,7 +124,7 @@ html
           div(class='view {{currentCtrl}} {{currentState.name|humanizeState}} {{queueStatus}} viewpoint-{{viewpoint.selected.name}}', infinite-scroll='addMoreItems()', infinite-scroll-collection='relatedItems')
             div(ui-view='')
 
-          div#milkyway(sigma, graph='graph', freeze='freeze', tips='headers.graph', togglemenu='toggleMenu(e, item, tag)', class='{{currentState.name|humanizeState}} {{queueStatus}} viewpoint-{{viewpoint.selected.name}}', controller='currentCtrl', setmessage='setMessage(message)', redirect='redirect(path)', queue="addToQueue(items)", filter='addFilter(key, value)')
+          div#milkyway(sigma, user='user', graph='graph', freeze='freeze', tips='headers.graph', togglemenu='toggleMenu(e, item, tag)', class='{{currentState.name|humanizeState}} {{queueStatus}} viewpoint-{{viewpoint.selected.name}}', controller='currentCtrl', setmessage='setMessage(message)', redirect='redirect(path)', queue="addToQueue(items)", filter='addFilter(key, value)')
 
           div(id='timeline', timeline, class='{{currentState.name}} {{queueStatus}}', t='timeline', cxt='contextualTimeline', filters="filters")