From 12c2e1bfc528667adfb8ac3cb1cb17f3ec69a2ef Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Mon, 1 Feb 2016 17:49:45 +0100 Subject: [PATCH] add user correctly in sigma directive snippet --- client/src/css/style.css | 14 +++++++++++++- client/src/js/directives/sigma.js | 1 + client/src/js/directives/snippets.js | 4 ++-- client/src/js/templates.js | 2 +- client/src/templates/partials/helpers/sigma.html | 2 +- client/views/index.jade | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/client/src/css/style.css b/client/src/css/style.css index b26597c..719742b 100644 --- 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,6 +1721,10 @@ height: 150px; background-repeat:no-repeat; background-position:center; border-radius: 50px; + +} + +.node.person .thumbnail-wrapper{ border: 3px solid #4dc3ba; } @@ -1728,6 +1732,14 @@ height: 150px; 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 index f5dab6e..a84ecd5 100644 --- 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 index b89365c..540aceb 100644 --- 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 index 45bac35..39acfda 100644 --- a/client/src/js/templates.js +++ b/client/src/js/templates.js @@ -40,7 +40,7 @@ $templateCache.put("templates/partials/helpers/gasp.html","
$templateCache.put("templates/partials/helpers/grammar.html","\r\n
\r\n \r\n \r\n \r\n \r\n\r\n\r\n \r\n
\r\n \r\n {{grammar.label|enrichWithStateParams:stateParams}} (\r\n {{totalItems}})\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n  {{grammar.connector.type}} \r\n \r\n
\r\n \r\n \r\n {{filter}} {{!$last? \' OR \': \'\'}}\r\n \r\n \r\n \r\n {{grammar.types[0].name}}\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n \r\n  {{grammar.connector.relatedTo}} \r\n \r\n \r\n \r\n \r\n
\r\n {{item.props|lookup:\'name\':language:24}} \r\n
\r\n {{!$last? \' OR \': \'\'}}\r\n
\r\n\r\n
\r\n \r\n  {{grammar.connector.notRelatedTo}} \r\n \r\n
\r\n \r\n
    \r\n
  • \r\n
    \r\n \r\n
    \r\n \r\n
    \r\n
    \r\n
  • \r\n
\r\n
\r\n \r\n \r\n \r\n
\r\n \r\n \r\n \r\n  {{grammar.connector.from}} \r\n \r\n \r\n {{filter}} \r\n \r\n \r\n \r\n \r\n  {{grammar.connector.to}} \r\n \r\n {{filter}} \r\n \r\n \r\n \r\n \r\n \r\n
"); $templateCache.put("templates/partials/helpers/menu.html",""); $templateCache.put("templates/partials/helpers/network-legend.html","
\n \n
\n {{weight}}\n  \n  \n \n {{left.label|truncate:20}} → \n {{right.label|truncate:20}}\n \n
\n
\n \n \n\n\n \n \n \n\n \n \n \n
\n
"); -$templateCache.put("templates/partials/helpers/sigma.html","
\r\n \r\n \r\n
\r\n
{{message.text}}
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \r\n
"); +$templateCache.put("templates/partials/helpers/sigma.html","
\r\n \r\n \r\n
\r\n
{{message.text}}
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n \r\n \r\n
"); $templateCache.put("templates/partials/helpers/snippet.html","
\r\n \r\n
\r\n
\r\n \r\n
\r\n
1\' class=\"line\">\r\n
{{totalItems || weight}}
\r\n
\r\n \r\n
\r\n \r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n

\r\n
{{relatedItem.type}} - \r\n\r\n {{relatedItem.props.birth_time | datesOfAPerson : relatedItem.props.death_time}}\r\n {{relatedItem.props.country}} {{relatedItem.props.lat}} - {{relatedItem.props.lng}}\r\n
\r\n
VIAF: {{relatedItem.props.links_viaf}}
\r\n \r\n
\r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n more\r\n \r\n \r\n
\r\n
\r\n
\r\n\r\n \r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
\r\n

\r\n
{{relatedItem.props | guessInterval}}
\r\n\r\n
\r\n
\r\n more\r\n \r\n \r\n
\r\n \r\n
\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n
\r\n persons in the document:\r\n {{per.props.name}}{{$last? \'\': \', \'}}\r\n \r\n — groups:\r\n {{per.props.name}}{{$last? \'\': \', \'}}\r\n \r\n — organizations:\r\n {{per.props.name}}{{$last? \'\': \', \'}}\r\n \r\n
\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n \r\n
\r\n\r\n
\r\n
\r\n
\r\n \r\n
\r\n
\r\n
\r\n
\r\n
\r\n\r\n \r\n
\r\n \r\n
\r\n
\r\n
"); $templateCache.put("templates/partials/helpers/suggest.html",""); $templateCache.put("templates/partials/helpers/typeahead.html","\r\n");}]); \ No newline at end of file diff --git a/client/src/templates/partials/helpers/sigma.html b/client/src/templates/partials/helpers/sigma.html index 8f89bd8..855e520 100644 --- a/client/src/templates/partials/helpers/sigma.html +++ b/client/src/templates/partials/helpers/sigma.html @@ -1,7 +1,7 @@
-
+
{{message.text}}
diff --git a/client/views/index.jade b/client/views/index.jade index c9aa0eb..d20567b 100644 --- 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")