on notice display add external link to subject, locations, and languages, correct #0025938
authorymh <ymh.work@gmail.com>
Wed, 01 Feb 2017 17:54:44 +0100
changeset 492 acecbffac2c4
parent 491 e9e436a588b2
child 493 30eb8d81dc27
on notice display add external link to subject, locations, and languages, correct #0025938
cms/app-client/app/styles/components/notice-component.scss
cms/app-client/app/templates/components/notice-component.hbs
cms/app-client/app/templates/components/notice-location-component.hbs
common/corpus-common-addon/addon/components/doc-language.js
common/corpus-common-addon/addon/components/doc-location.js
common/corpus-common-addon/addon/components/doc-subject.js
common/corpus-common-addon/addon/templates/components/doc-language.hbs
common/corpus-common-addon/addon/templates/components/doc-location.hbs
common/corpus-common-addon/addon/templates/components/doc-subject.hbs
--- a/cms/app-client/app/styles/components/notice-component.scss	Tue Jan 31 19:05:12 2017 +0100
+++ b/cms/app-client/app/styles/components/notice-component.scss	Wed Feb 01 17:54:44 2017 +0100
@@ -13,13 +13,16 @@
 }
 
 .notice-component {
+  .bo-doc-ref-url {
+    text-decoration: none;
+    color: $corpus-black;
+  }
   .notice-permalink:after,
-  .bo-doc-ref-link:after {
+  .bo-doc-ref-url:after {
       content: "\f045";
       font-family: FontAwesome;
       font-style: normal;
       font-weight: normal;
-      text-decoration: inherit;
 
       padding-right: 0.5em;
       padding-left: 0.3em;
--- a/cms/app-client/app/templates/components/notice-component.hbs	Tue Jan 31 19:05:12 2017 +0100
+++ b/cms/app-client/app/templates/components/notice-component.hbs	Wed Feb 01 17:54:44 2017 +0100
@@ -13,7 +13,7 @@
   </tr>
   <tr>
     <td class="title">Langue</td>
-    <td>{{#each item.languages as |lang index|}}{{if index ", "}}{{ component (getLinkType lang) url=lang class="language" onClick=(action 'addLanguageFilter' lang)}}{{/each}}</td>
+    <td>{{#each item.languages as |lang index|}}{{if index ", "}}{{ component (getLinkType lang) url=lang class="language" onClick=(action 'addLanguageFilter' lang) displayUrlLink=true}}{{/each}}</td>
   </tr>
   <tr>
     <td class="title">Sujet{{#if (if-operator item.computedSubjects.length '>' 1)}}s{{/if}}</td>
@@ -21,7 +21,7 @@
       <ul>
         {{#each item.subjects as |subject|}}
         <li>
-          {{component (getLinkType subject) url=subject onClick=(action "addThemeFilter" subject)}}
+          {{component (getLinkType subject) url=subject onClick=(action "addThemeFilter" subject) displayUrlLink=true}}
         </li>
         {{/each}}
       </ul>
--- a/cms/app-client/app/templates/components/notice-location-component.hbs	Tue Jan 31 19:05:12 2017 +0100
+++ b/cms/app-client/app/templates/components/notice-location-component.hbs	Wed Feb 01 17:54:44 2017 +0100
@@ -2,7 +2,7 @@
 {{#if geoInfo.ref-locs }}
 <ul>
   {{#if geonamesLink }}
-  <li>{{doc-location url=geonamesLink }}</li>
+  <li>{{doc-location url=geonamesLink displayUrlLink=true}}</li>
   {{/if}}
   {{#each otherRefLinks as |link| }}
   <li><a href={{link}} target="_blank" class="notice-location-ext-link">{{link}}</a></li>
--- a/common/corpus-common-addon/addon/components/doc-language.js	Tue Jan 31 19:05:12 2017 +0100
+++ b/common/corpus-common-addon/addon/components/doc-language.js	Wed Feb 01 17:54:44 2017 +0100
@@ -5,6 +5,7 @@
 export default Ember.Component.extend({
   layout: layout,
   tagName: 'span',
+  displayUrlLink: false,
 
   lexvoResolver: Ember.inject.service(),
 
--- a/common/corpus-common-addon/addon/components/doc-location.js	Tue Jan 31 19:05:12 2017 +0100
+++ b/common/corpus-common-addon/addon/components/doc-location.js	Wed Feb 01 17:54:44 2017 +0100
@@ -5,6 +5,7 @@
 export default Ember.Component.extend({
   layout: layout,
   tagName: 'span',
+  displayUrlLink: false,
 
   geonamesResolver: Ember.inject.service(),
 
--- a/common/corpus-common-addon/addon/components/doc-subject.js	Tue Jan 31 19:05:12 2017 +0100
+++ b/common/corpus-common-addon/addon/components/doc-subject.js	Wed Feb 01 17:54:44 2017 +0100
@@ -9,6 +9,7 @@
     return this.get('label') || this.get('resolvedLabel');
   }),
   bnfResolver: Ember.inject.service(),
+  displayUrlLink: false,
 
   _resolveBnfIds: Ember.on('init', Ember.observer('url', 'label', function () {
     if (this.get('label')) {
--- a/common/corpus-common-addon/addon/templates/components/doc-language.hbs	Tue Jan 31 19:05:12 2017 +0100
+++ b/common/corpus-common-addon/addon/templates/components/doc-language.hbs	Wed Feb 01 17:54:44 2017 +0100
@@ -3,6 +3,7 @@
 {{else if isLanguageLink}}
 {{#if onClick }}
 <span {{ action onClick }} title={{url}} class="bo-doc-ref-link doc-link-lexvo">{{#if resolvedName}}{{resolvedName}}{{else}}{{code}}{{/if}}</span>
+{{#if displayUrlLink}}<a href="{{url}}" target="_blank" title={{url}} class="bo-doc-ref-url doc-link-lexvo-url">&nbsp;</a>{{/if}}
 {{else}}
 <a href="{{url}}" target="_blank" title={{url}} class="bo-doc-ref-link doc-link-lexvo">
   {{#if resolvedName}}{{resolvedName}}{{else}}{{code}}{{/if}}
--- a/common/corpus-common-addon/addon/templates/components/doc-location.hbs	Tue Jan 31 19:05:12 2017 +0100
+++ b/common/corpus-common-addon/addon/templates/components/doc-location.hbs	Wed Feb 01 17:54:44 2017 +0100
@@ -2,6 +2,7 @@
 <a href="{{url}}" target="_blank" title="{{url}}" class="bo-doc-ref-link doc-link-geonames">
   {{#if resolvedLabel}}{{resolvedLabel}}{{else}}{{code}}{{/if}}
 </a>
+{{#if displayUrlLink}}<a href="{{url}}" target="_blank" title={{url}} class="bo-doc-ref-url doc-link-geonames-url">&nbsp;</a>{{/if}}
 {{else}}
 {{#if resolvedLabel}}{{resolvedLabel}}{{else}}{{code}}{{/if}}
 {{/if}}
--- a/common/corpus-common-addon/addon/templates/components/doc-subject.hbs	Tue Jan 31 19:05:12 2017 +0100
+++ b/common/corpus-common-addon/addon/templates/components/doc-subject.hbs	Wed Feb 01 17:54:44 2017 +0100
@@ -1,6 +1,7 @@
 {{#if isSubjectLink}}
 {{#if onClick }}
 <span {{ action onClick }} title={{url}} class="bo-doc-ref-link doc-link-bnf">{{#if displayLabel}}{{displayLabel}}{{else}}{{code}}{{/if}}</span>
+{{#if displayUrlLink}}<a href="{{url}}" target="_blank" title={{url}} class="bo-doc-ref-url doc-link-bnf-url">&nbsp;</a>{{/if}}
 {{else}}
 <a href="{{url}}" target="_blank" title={{url}} class="bo-doc-ref-link doc-link-bnf">
   {{#if displayLabel}}{{displayLabel}}{{else}}{{code}}{{/if}}