1.24.0 release

Author: baumandm

.gitignore

@@ -33,3 +33,5 @@ node_modules
 
 # Mac
 .DS_Store
+
+*.diff

CHANGELOG.md

@@ -1,3 +1,23 @@
+# 1.24.0 (02/04/2016)
+
+## Features
+
+ - Scrolling Dashboards: Dashboards now automatically scroll if the Widgets on a page exceed the size of the browser.  If the Widgets on a page fit without overflowing, the Dashboard will appear as before without any scrollbars.  This replaces the previous behavior of fitting the page to the browser window, and hiding any overflowing content.
+
+ - Likes: Added the ability for logged-in users to like (and unlike) dashboards.  Users can search for dashboards they liked, or sort search results by the number of likes
+
+ - Sortable Search Results: The Dashboard Search results can be sorted using various keys such as Name, Tags, Visits, Likes, etc.
+
+ - Advanced Search Filters: Dashboards can be searched using several new search filters: "is:deleted", "include:deleted", "likedby:<user>", "lastupdatedby:<user>".
+
+## Bug Fixes
+
+ - Data Sources must be created with unique names
+
+ - Navigating through Cyclotron pages using browser back button does not work
+ 
+ - Annotation Chart: annotationsWidth property in AnnotationChart widget should be a numerical field instead of a string
+
 # 1.23.0 (01/21/2016)
 
 ## Features

cyclotron-site/app/partials/analytics.jade

@@ -40,6 +40,23 @@
             dd  
                 ng-pluralize(count='statistics.revisions.avgRevisionCount', when='{"one": "Revision", "other": "Revisions"}')
                 |  per Dashboard
+
+        h2 Likes
+        dl(title='Total number of Dashboard Likes')
+            dt {{ statistics.likes.count | numeraljs:'0,0' }} 
+            dd total Likes
+        dl(title='Total number of Dashboard Likes within the last day')
+            dt {{ statistics.likes.occurredPastDayCount | numeraljs:'0,0' }} 
+            dd Likes in the last day
+        dl(title='Total number of Dashboard Likes within the last week')
+            dt {{ statistics.likes.occurredPastWeekCount | numeraljs:'0,0' }} 
+            dd Likes in the last week
+        dl(title='Total number of Dashboard Likes within the last 6 months')
+            dt {{ statistics.likes.occurredPastSixMonthsCount | numeraljs:'0,0' }} 
+            dd Likes in the last 6 months
+        dl(title='Total number of Dashboard Unlikes')
+            dt {{ statistics.unlikes.count | numeraljs:'0,0' }} 
+            dd total Unlikes
 
         h2 Visits
         dl(title='Total number of times any Dashboard was visited')

cyclotron-site/app/partials/dashboard.jade

@@ -1,13 +1,17 @@
 
 //- Dashboards
-div.dashboard.fullscreen
+div.dashboard
 
     .dashboard-controls
         i.fa.fa-chevron-left(ng-click='moveBack()', ng-class='{ disabled: !canMoveBack() }', title='Go to the previous page')
         i.fa.fa-pause(ng-click='pause()', ng-show='!paused', title='Pause Dashboard page rotation')
         i.fa.fa-play(ng-click='play()', ng-show='paused', ng-class='{ disabled: !canMoveForward() }', title='Start Dashboard page rotation')
         a.fa.fa-download(ng-href='{{ exportUrl }}', target='_blank', title='Export the Dashboard')
+        i.fa.fa-thumbs-o-up(requires-login, ng-if='!isLiked', ng-click='toggleLike()', title='Like this Dashboard')
+        i.fa.fa-thumbs-up(requires-login, ng-if='isLiked', ng-click='toggleLike()', title='Unlike this Dashboard')    
         i.fa.fa-chevron-right(ng-click='moveForward()', ng-class='{ disabled: !canMoveForward() }', title='Go to the next page')
 
-    div(dashboard-page, dashboard='dashboard', page='page', page-number='{{ currentPageIndex }}', ng-repeat='page in currentPage')
+    .dashboard-pages
+        div(dashboard-page, dashboard='dashboard', page='page', page-number='{{ currentPageIndex }}', 
+            ng-repeat='page in currentPage')
 

cyclotron-site/app/partials/editor/dataSource.jade

@@ -12,6 +12,9 @@
     select.form-control(ng-model='dataSource.type', title='{{ dashboardProperties.dataSources.properties.type.description }}')
         option(ng-repeat='(optionKey, optionValue) in dashboardProperties.dataSources.options') {{ optionValue.value }}
 
-.bg-info(ng-show='dataSourceMessage()', ng-bind-html='dataSourceMessage()')
+.bg-info(ng-if='dataSourceMessage()', ng-bind-html='dataSourceMessage()')
+
+.bg-danger(ng-if='isDuplicateDataSourceName(dataSource)')
+    | The Data Source name must be unique to the Dashboard.
 
 .editor-property-set(model='dataSource', definition='combinedDataSourceProperties(dataSource)', ng-if='dataSource.type')

cyclotron-site/app/partials/editor/guiEditor.jade

@@ -27,25 +27,36 @@
                 title='{{ editor.dashboardWrapper.visits }} total visits, {{ editor.dashboardWrapper.pageViews }} total page views')
                 i(class='fa {{ getVisitCategory().icon }}')
                 span  {{ getVisitCategory().text }} 
-                    ng-pluralize(count='getVisitCategory().text', when='{"one": "visit","other": "visits"}')
+                    ng-pluralize(count='getVisitCategory().text', when='{"one": "visit", "other": "visits"}')
 
-            h4.small.text-muted(ng-show='editor.dashboard.description')
+            h2.text-muted.likes-control(requires-auth, 
+                ng-hide='editor.isNew || !isLatestRevision() || !editor.likeCount', 
+                title='{{ editor.likeCount }} likes')
+                i.fa.fa-thumbs-up
+                span  {{ editor.likeCount }} 
+                    ng-pluralize(count='editor.likeCount', when='{1: "like", "other": "likes"}')
+
+            h4.small.text-muted(ng-if='editor.dashboard.description')
                 i.fa.fa-quote-left
                 |  {{ editor.dashboard.description }}
                 i.fa.fa-quote-right
 
-            h4.small.text-danger(ng-show='editor.dashboardWrapper.deleted')
+            h4.small.text-danger(ng-if='editor.dashboardWrapper.deleted')
                 i.fa.fa-exclamation-triangle
                 |  This Dashboard has been deleted.  Saving a new revision will undelete it.
 
-            h4.small.text-warning(ng-show='!isLoggedIn()')
+            h4.small.text-warning(ng-if='!isLoggedIn()')
                 i.fa.fa-exclamation-triangle
                 |  Dashboards cannot be created or edited without being logged in.
 
-            h4.small.text-warning(ng-show='isLoggedIn() && !editor.hasEditPermission')
+            h4.small.text-warning(ng-if='isLoggedIn() && !editor.hasEditPermission')
                 i.fa.fa-exclamation-triangle
                 |  You don't have permission to edit this Dashboard.
 
+            h4.small.text-warning(ng-if='hasDuplicateDataSourceName()')
+                i.fa.fa-exclamation-triangle
+                |  One or more Data Source names has been repeated.  All Data Source names must be unique to the Dashboard.
+
     .row
         .sidebar.col-sm-4
             ul.nav.nav-pills.nav-stacked
@@ -66,6 +77,7 @@
                     a(ng-click='goToSubState("edit.dataSource", dataSource, $index)', id='editor-dataSource-{{ dataSource.name }}')
                         i.fa.fa-angle-right
                         |  {{ getDataSourceName(dataSource) }}
+                        i.fa.fa-exclamation-triangle.right-hand-icon(ng-if='isDuplicateDataSourceName(dataSource)', title='This Data Source has a conflicting Name property.')
 
                 li(ng-class='{active: editor.currentEditor=="edit.pages"}')
                     a#editor-pages(ng-click='goToSubState("edit.pages", editor.dashboard.pages)')

cyclotron-site/app/partials/editor/propertySet.jade

@@ -46,6 +46,10 @@
             ng-required='{{ value.required }}', placeholder='{{ value.placeholder }}',
             type='number', ng-switch-when='integer')
 
+        input.form-control(ng-model='model[value.name]', 
+            ng-required='{{ value.required }}', placeholder='{{ value.placeholder }}',
+            type='number', ng-switch-when='number')
+
         input.form-control(ng-model='model[value.name]', 
             ng-required='{{ value.required }}', placeholder='{{ value.placeholder }}',
             type='{{ value.inputType || "text" }}', ng-switch-default)

cyclotron-site/app/partials/help/layout.jade

@@ -1,14 +1,22 @@
 h3 Layout
 
-p Dashboard pages are divided into rows and columns.  Each Widget in the Dashboard has a height and a width, which correspond to 
-    | the number of rows and columns that the Widget spans.  For example, a 2x2 Page can fit four 1x1 Widgets.  But it could also 
-    | fit one 2x1 and two 1x1 Widgets.  There are no limits on the number of rows and columns for a page, but lower values tend to
-    | work better for all resolutions.
+h4 Grid Layout
+p.
+    The primary layout scheme for Dashboards is a grid layout.  This means that a Dashboard page is divided into a fixed
+    number of rows and columns, which automatically scale up and down with the browser resolution.  Widgets are given a 
+    corresponding number of rows and columns, and they are resized accordingly to match the grid.  In general, this allows 
+    the Dashboard to be viewed at different browser resolutions and aspect ratios.  
 
-p The Page itself scales up and down based on the browser size, and gracefully handles resize events.  Each Widget will be resized
-    | accordingly.  In general, this allows Dashboards to be viewed at different browser resolutions and on mobile devices.  For 
-    | example, the Chart Widget resizes the chart to fill the entire space available to that widget.  The Table Widget, on the 
-    | other hand, will overflow the Widget if the content is larger than the widget dimensions, and will enable scrolling by default.
+h5 Widgets
+p Each Widget in the Dashboard can be assigned a
+    em  gridHeight
+    |  and 
+    em  gridWidth
+    | , which correspond to the number of rows and columns that the Widget spans.  
+    | For example, a 2x2 Page can fit four 1x1 Widgets.  But it could also 
+    | fit one 2x1 and two 1x1 Widgets.  It's possible to split rows and columns—e.g. 
+    em gridWidth
+    |  of 1.5 to span one and a half columns.  Care must be taken to ensure the Widgets align as expected.
 
 p Widgets are sized according to their 
     em gridHeight 
@@ -20,8 +28,23 @@ p Widgets are sized according to their
     | will not rearrange the Widgets to fit, but rather it only removes empty vertical space.  The Widgets are placed in order from the top left, 
     | wrapping as needed based on the number of columns.
 
-p It's also possible to provide more Widgets than will fit on the Dashboard.  Dashboards don't currently allow scrolling, since the original intention
-    | is to provide a scaled single-page dashboard view.  
+h5 Mobile Devices
+p.
+    Special consideration is given to mobile devices in landscape or portrait mode.  This overrides the normal grid settings
+    with either a 2x1 or 1x2 layout.  Widgets are also overridden to display in a 1x1 resolution.
+
+h5 Scrolling Dashboards
+p It's possible to provide more Widgets than will fit on the screen at once.  Dashboards can be scrolled to view additional 
+    |widgets.  The Grid Layout can still be used if the Page is longer than the browser—the Grid Height remains fixed 
+    | to the browser height.  However unless a Dashboard is designed for full-screen use, it may be desirable to specify fixed 
+    | heights for Widgets.  See the section on 
+    strong Absolute Layout
+    |  below for more information.
+
+p If needed, the ability to vertically scroll a Page can be forcibly disabled by setting the
+    em  scrolling
+    |  property to "false" in the Page's layout section.  However this should not be needed if the Widgets on a Page do not
+    |  extend below the bottom of the browser.
 
 p The default settings are for Pages to be 2x2 and Widgets to be 1x1.
 
@@ -73,7 +96,12 @@ p It is also possible to define absolute sizes for all or some Widgets.  The Wid
     | and 
     em width 
     | properties which take CSS-compatible dimensions, e.g. "20%", "200px", "5rem".  
-    | This is not recommended since it prevents the Dashboard from scaling correctly, but may be desirable
-    | to specify dimensions in pixels for Dashboards intended for a display with a known size.
+    | This may be useful for displaying fixed-height or non-scalable content, however this prevents
+    | Widgets from automatically scaling with the Dashboard.
 
-p There's not much benefit to using percentages, since the grid layout implemention is effectively the same.
+p Absolute sizing can be combined with the Grid Layout by defining only one property of each.  For example,
+    | setting the 
+    em  height
+    |  property and the 
+    em  gridWidth
+    |  property together will create a fixed-height but fluid-width Widget.

cyclotron-site/app/partials/home.jade

@@ -11,11 +11,13 @@
 
         ui-select(ng-model='search.query', multiple='',
             tagging='', tagging-label='false', tagging-tokens='SPACE|ENTER')
-            ui-select-match(placeholder='Search by Name or Tags...') 
+            ui-select-match(placeholder='Search by Name or Tags...')
                 i.fa.fa-tag(ng-if='isTag($item)')
+                i.fa.fa-filter(ng-if='isAdvanced($item)')
                 span  {{ $item }}
             ui-select-choices(repeat='hint in search.hints | filter:$select.search | limitTo:100')
                 i.fa.fa-tag(ng-if='isTag(hint)')
+                i.fa.fa-filter(ng-if='isAdvanced(hint)')
                 span  {{ hint }}
 
     section.main-links(ng-show='showSplash')
@@ -31,10 +33,10 @@
         a.login(ui-sref='analytics', title='Analytics for Cyclotron')
             i.fa.fa-bar-chart
             span Analytics
-        a.login(requires-auth, ng-click='login()', ng-if='!isLoggedIn()', title='Login')
+        a.login(requires-auth, ng-if='!isLoggedIn()', ng-click='login()',title='Login')
             i.fa.fa-unlock
             span Login
-        a.logout(requires-auth, ng-click='logout()', ng-if='isLoggedIn()', title='Logout')
+        a.logout(requires-login, ng-click='logout()', title='Logout')
             i.fa.fa-lock
             span Logout
 
@@ -46,15 +48,38 @@
         .no-results.well.well-sm(ng-show='dashboards.length == 0')
             span No matching Dashboards were found
 
-        table.table
-            tr.dashboard-item(ng-repeat='dashboard in dashboards | orderBy:"name"', ng-class='{"dashboard-item-unviewable": !dashboard._canView}')
-
+        table.table(ng-show='dashboards.length > 0')
+            thead
+                tr
+                    th(requires-login)
+                        a(ng-click='sortBy("_liked", true)') 
+                            i.fa.fa-thumbs-up
+                    th
+                        a(ng-click='sortBy("name", false)', ng-class='{ selected: sortByField == "name" }') Name
+                        span  / 
+                        a(ng-click='sortBy(tagSorter, false)', ng-class='{ selected: sortByField == tagSorter }') Tags
+                        span  / 
+                        a(ng-click='sortBy("date", true)', ng-class='{ selected: sortByField == "date" }') Last Modified
+                    th.dashboard-analytics
+                        a(ng-click='sortBy("visits", true)', ng-class='{ selected: sortByField == "visits" }') Visits
+                        span(requires-auth)  / 
+                        a(requires-auth, ng-click='sortBy("likeCount", true)', ng-class='{ selected: sortByField == "likeCount" }') Likes
+                    th
+            tr.dashboard-item(ng-repeat='dashboard in dashboards | orderBy:sortByField:sortByReverse', 
+                ng-class='{"dashboard-item-unviewable": !dashboard._canView, "dashboard-item-deleted": dashboard.deleted }')
+                td.like(requires-login)
+                    a(ng-click='toggleLike(dashboard)')
+                        i.fa.fa-thumbs-up(ng-if='dashboard._liked', title='Unlike this Dashboard')
+                        i.fa.fa-thumbs-o-up(ng-if='!dashboard._liked', title='Like this Dashboard')
                 td
+                    span.name(ng-if='dashboard.deleted') {{ dashboard.name }}
+                        i.fa.fa-trash-o(title="This Dashboard has been deleted.")
+
                     span.name(ng-if='!dashboard._canView') {{ dashboard.name }}
                         i.fa.fa-lock(title="You don't have permission to edit this Dashboard.")
                         i.fa.fa-eye-slash(title="You don't have permission to view this Dashboard.")
 
-                    a.name(ng-if='dashboard._canView', ng-href='/{{ dashboard.name }}', target='_blank', title='Open the Dashboard') {{ dashboard.name }}
+                    a.name(ng-if='dashboard._canView && !dashboard.deleted', ng-href='/{{ dashboard.name }}', target='_blank', title='Open the Dashboard') {{ dashboard.name }}
                         i.fa.fa-lock(ng-if='isLoggedIn() && !dashboard._canEdit', title="You don't have permission to edit this Dashboard.")
                         i.fa.fa-external-link
 
@@ -74,12 +99,16 @@
                         ng-click='selectTag(tag)', title='Add to search') {{ tag }}
 
                 td.dashboard-analytics
-                    .info
-                        a.text-muted(ng-if='dashboard.visits > 0',
-                            ui-sref='dashboardAnalytics({ dashboardName: dashboard.name })', title='View Analytics for this Dashboard')
+                    .info(ng-if='dashboard.visits > 0')
+                        a(ui-sref='dashboardAnalytics({ dashboardName: dashboard.name })', 
+                            title='View Analytics for this Dashboard')
                             i(class='fa {{ dashboard.visitCategory.icon }}')
                             span  {{ dashboard.visitCategory.text }} 
                                 ng-pluralize(count='dashboard.visits', when='{"one": "visit","other": "visits"}')
+                    .info(requires-auth, ng-if='dashboard.likeCount > 0')
+                        i.fa.fa-thumbs-up
+                        span  {{ dashboard.likeCount }} 
+                                ng-pluralize(count='dashboard.likeCount', when='{"one": "like","other": "likes"}')
 
                 td.dashboard-links
                     div

cyclotron-site/app/scripts/common/app.coffee

@@ -341,8 +341,7 @@ cyclotronApp.run ($rootScope, $urlRouter, $location, $state, $stateParams, $moda
         # Prevent $urlRouter's default handler from firing
         event.preventDefault()
 
-        currentName = $state.current.name
-        if currentName != 'dashboard' and currentName.substring(0,5) != 'edit.'
+        if $state.current.name != 'dashboard'
             $urlRouter.sync()
 
     $rootScope.$on '$stateChangeError', (event, toState, toParams, fromState, fromParams, error) ->