nitweb: move grades frontend from card to tab

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/share/nitweb/directives/entity/card.html b/share/nitweb/directives/entity/card.html
index 0b48c22..bb594ae 100644 (file)
--- a/share/nitweb/directives/entity/card.html
+++ b/share/nitweb/directives/entity/card.html
@@ -6,30 +6,6 @@
                <h5 class='card-heading' ng-if='!noSynopsis'>
                        <entity-signature mentity='mentity'/>
                </h5>
-               <div class='tab-content'>
-                       <div id='{{mentity.html_id}}-signature' class='tab-pane' ng-if='!noSynopsis'
-                         ng-class='currentTab == "signature" ? "active" : ""'>
-                               <span class='synopsis' ng-bind-html='mentity.mdoc.html_synopsis' />
-                       </div>
-                       <div id='{{mentity.html_id}}-grade' class='tab-pane'
-                         ng-class='currentTab == "grade" ? "active" : ""'>
-                               <entity-rating mentity='mentity' ratings='ratings'>
-                       </div>
-               </div>
-       </div>
-       <div class='card-right'>
-               <div class='dropdown'>
-                       <button class='btn btn-link dropdown-toggle' type='button' data-toggle='dropdown'>
-                               <span class='glyphicon glyphicon-chevron-down'></span>
-                       </button>
-                       <ul class='dropdown-menu dropdown-menu-right'>
-                               <li ng-class='currentTab == "signature" ? "active" : ""' ng-if='!noSynopsis'>
-                                       <a ng-click='currentTab = "signature"'>Signature</a>
-                               </li>
-                               <li ng-class='currentTab == "grade" ? "active" : ""'>
-                                       <a ng-click='loadEntityStars(); currentTab = "grade"'>Grade</a>
-                               </li>
-                       </ul>
-               </div>
+               <span class='synopsis' ng-bind-html='mentity.mdoc.html_synopsis' />
        </div>
 </div>

diff --git a/share/nitweb/javascripts/grades.js b/share/nitweb/javascripts/grades.js
index 72eadbc..96ede05 100644 (file)
--- a/share/nitweb/javascripts/grades.js
+++ b/share/nitweb/javascripts/grades.js
@@ -20,6 +20,25 @@
 
                .config(function($stateProvider, $locationProvider) {
                        $stateProvider
+                               .state('doc.entity.grades', {
+                                       url: '/grades',
+                                       templateUrl: 'views/doc/grades.html',
+                                       resolve: {
+                                               metrics: function(Feedback, $q, $stateParams, $state) {
+                                                       var d = $q.defer();
+                                                       Feedback.loadEntityStars($stateParams.id, d.resolve,
+                                                               function() {
+                                                                       $state.go('404', null, { location: false })
+                                                               });
+                                                       return d.promise;
+                                               }
+                                       },
+                                       controller: function(mentity, metrics) {
+                                               this.mentity = mentity;
+                                               this.metrics = metrics;
+                                       },
+                                       controllerAs: 'vm',
+                               })
                                .state('grades', {
                                        url: '/grades',
                                        templateUrl: 'views/grades.html',

diff --git a/share/nitweb/views/doc/entity.html b/share/nitweb/views/doc/entity.html
index 3543b9f..e6b559f 100644 (file)
--- a/share/nitweb/views/doc/entity.html
+++ b/share/nitweb/views/doc/entity.html
@@ -80,6 +80,13 @@
                                <span class='glyphicon glyphicon-stats'/> Metrics
                        </a>
                </li>
+
+               <!-- grades -->
+               <li role='presentation' ui-sref-active='active'>
+                       <a ui-sref='.grades'>
+                               <span class='glyphicon glyphicon-star'/> Grades
+                       </a>
+               </li>
        </ul>
        <br>
        <ui-view />

diff --git a/share/nitweb/views/doc/grades.html b/share/nitweb/views/doc/grades.html
new file mode 100644 (file)
index 0000000..89fc74c
--- /dev/null
+++ b/share/nitweb/views/doc/grades.html
@@ -0,0 +1,5 @@
+<div class='card'>
+       <div class='card-body'>
+               <entity-rating mentity='vm.mentity' ratings='vm.ratings'>
+       </div>
+</div>