Download as
Browse Code »

Commit 11d500f1cb4e3662bee6cf3dfb9d462586757795

Authored by Victor Costa
2 parents 2778f657 246f026b
Exists in updated_signup_page and in 2 other branches staging, tags-block

Merge branch 'master' into staging

Showing 5 changed files with 15 additions and 11 deletions   Show diff stats
bower.json
  Diff comments   View file @11d500f
... ... @@ -35,13 +35,13 @@
35 35 "angular-i18n": "^1.5.0",
36 36 "angular-load": "^0.4.1",
37 37 "angular-translate-interpolation-messageformat": "^2.10.0",
38   - "angular-bind-html-compile": "^1.2.1",
39   - "angular-click-outside": "^2.7.1",
40   - "ng-ckeditor": "^0.2.1",
41   - "ckeditor": "^4.5.8"
  38 + "angular-bind-html-compile": "^1.2.1",
  39 + "angular-click-outside": "^2.7.1"
42 40 },
43 41 "devDependencies": {
44   - "angular-mocks": "~1.5.0"
  42 + "angular-mocks": "~1.5.0",
  43 + "ng-ckeditor": "^0.2.1",
  44 + "ckeditor": "^4.5.8"
45 45 },
46 46 "overrides": {
47 47 "bootstrap-sass": {
... ...
gulp/build.js
  Diff comments   View file @11d500f
... ... @@ -80,8 +80,8 @@ gulp.task('html', ['inject', 'partials'], function () {
80 80 .pipe($.useref())
81 81 .pipe($.revReplace({prefix: noosferoThemePrefix}))
82 82 .pipe(htmlFilter)
83   - .pipe($.replace('/ng-ckeditor/libs/ckeditor/', noosferoThemePrefix + 'ng-ckeditor/libs/ckeditor/'))
84   - .pipe($.replace('/ng-ckeditor/ng-ckeditor.min.js', noosferoThemePrefix + 'ng-ckeditor/ng-ckeditor.min.js'))
  83 + .pipe($.replace('/bower_components/ng-ckeditor/libs/ckeditor/', noosferoThemePrefix + 'ng-ckeditor/libs/ckeditor/'))
  84 + .pipe($.replace('/bower_components/ng-ckeditor/ng-ckeditor.min.js', noosferoThemePrefix + 'ng-ckeditor/ng-ckeditor.min.js'))
85 85 .pipe($.minifyHtml({
86 86 empty: true,
87 87 spare: true,
... ...
src/index.html
  Diff comments   View file @11d500f
... ... @@ -28,7 +28,7 @@
28 28 <div ui-view></div>
29 29  
30 30 <script>
31   - CKEDITOR_BASEPATH='/ng-ckeditor/libs/ckeditor/';
  31 + CKEDITOR_BASEPATH='/bower_components/ng-ckeditor/libs/ckeditor/';
32 32 </script>
33 33  
34 34 <!-- build:js(src) scripts/vendor.js -->
... ... @@ -46,7 +46,7 @@
46 46 <!-- endinject -->
47 47 <!-- endbuild -->
48 48  
49   - <script src="/ng-ckeditor/libs/ckeditor/ckeditor.js"></script>
50   - <script src="/ng-ckeditor/ng-ckeditor.min.js"></script>
  49 + <script src="/bower_components/ng-ckeditor/libs/ckeditor/ckeditor.js"></script>
  50 + <script src="/bower_components/ng-ckeditor/ng-ckeditor.min.js"></script>
51 51 </body>
52 52 </html>
... ...
src/plugins/comment_paragraph/hotspot/article-content/article-content.component.ts
  Diff comments   View file @11d500f
... ... @@ -9,4 +9,8 @@ import {Hotspot} from &quot;../../../../app/hotspot/hotspot.decorator&quot;;
9 9 export class CommentParagraphArticleContentHotspotComponent {
10 10  
11 11 @Input() article: noosfero.Article;
  12 +
  13 + isDiscussion() {
  14 + return this.article.type === "CommentParagraphPlugin::Discussion";
  15 + }
12 16 }
... ...
src/plugins/comment_paragraph/hotspot/article-content/article-content.html
  Diff comments   View file @11d500f
1   -<div class="discussion-header">
  1 +<div class="discussion-header" ng-if="ctrl.isDiscussion()">
2 2 <span class="description">{{"comment-paragraph-plugin.discussion.header" | translate}}</span>
3 3 <span class="start-date date" ng-if="ctrl.article.start_date">
4 4 <span class="description">{{"comment-paragraph-plugin.discussion.editor.start_date.label" | translate}}</span>
... ...