Merge branch 'develop'

Author: toastercup

app/api/v1/entities/webpage.rb

@@ -20,9 +20,13 @@ class Webpage < Grape::Entity
       expose :dynamic_yield_sku, documentation: { type: 'String', desc: "Dynamic Yield Webpage SKU/ID" }
       expose :dynamic_yield_category, documentation: { type: 'String', desc: "Dynamic Yield Webpage Category" }
 
+      expose :tables_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as JSON'}
+
       with_options if: { full: true } do
         expose :user, with: '::V1::Entities::User', documentation: {type: 'User', desc: 'Owner'}
         expose :url, documentation: { type: 'String', desc: 'URL of Webpage' }
+
+        expose :tables_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as YAML'}
       end
     end
   end

app/api/v1/resources/media.rb

@@ -21,7 +21,7 @@ class Media < Grape::API
 
           @media = ::GetMultipleMedia.call(params: declared(clean_params(params), include_missing: false), tenant: current_tenant).media
           set_paginate_headers(@media)
-          ::V1::Entities::Media.represent @media
+          ::V1::Entities::Media.represent @media.to_a
         end
 
         desc 'Show media tags'

app/api/v1/resources/posts.rb

@@ -21,7 +21,7 @@ class Posts < Grape::API
           authorize! :view, ::Post
           @posts = ::GetPosts.call(params: declared(clean_params(params), include_missing: false), tenant: current_tenant).posts
           set_paginate_headers(@posts)
-          ::V1::Entities::Post.represent @posts
+          ::V1::Entities::Post.represent @posts.to_a
         end
 
         desc 'Show published posts', { entity: ::V1::Entities::Post, nickname: "postFeed" }
@@ -61,7 +61,7 @@ class Posts < Grape::API
 
           @posts = ::GetRelatedPosts.call(post: post, params: declared(clean_params(params), include_missing: false), tenant: current_tenant, published: true).posts
           set_paginate_headers(@posts)
-          ::V1::Entities::Post.represent @posts
+          ::V1::Entities::Post.represent @posts.to_a
         end
 
         desc 'Show a published post', { entity: ::V1::Entities::Post, nickname: "showFeedPost" }

app/api/v1/resources/webpages.rb

@@ -18,7 +18,7 @@ class Webpages < Grape::API
 
           @webpages = ::GetWebpages.call(params: declared(clean_params(params), include_missing: false), tenant: current_tenant).webpages
           set_paginate_headers(@webpages)
-          ::V1::Entities::Webpage.represent @webpages, full: true
+          ::V1::Entities::Webpage.represent @webpages.to_a, full: true
         end
 
         desc 'Show Webpage Snippets as public feed by URL', { entity: ::V1::Entities::Webpage, nickname: 'showWebpageFeed' }

app/assets/images/icons/add.svg

@@ -17,5 +17,6 @@
 //= require datepicker_init
 //= require media_dialogs
 //= require sidebar-toggle
+//= require quick_links
 
 // require turbolinks # temporarily disabled

app/assets/images/icons/blog.png

@@ -0,0 +1,13 @@
+(function (global) {
+  'use strict';
+
+  $(document).ready(function() {
+    $('.quick-links .jumbo-button').hover(function () {
+      $(this).find('.jumbo-button__content__icon').css('display', 'none');
+      $(this).find('.jumbo-button__content__add').css('display', 'block');
+    }, function () {
+      $(this).find('.jumbo-button__content__icon').css('display', 'block');
+      $(this).find('.jumbo-button__content__add').css('display', 'none');
+    });
+  });
+}(this));

app/assets/images/icons/media.png

@@ -29,7 +29,7 @@
           <div class="form-group">
             <label for="description">Description (155 characters max)</label>
             <textarea id="seo_description" name="seo_description" class="form-control"
-                   ng-model="data.webpage.seo_description" placeholder="Page Description" required></textarea>
+                      ng-model="data.webpage.seo_description" placeholder="Page Description" required></textarea>
           </div>
 
           <div class="keywords tags">
@@ -48,32 +48,38 @@
 
           <div class="checkbox">
             <label>
-              <input type="checkbox" name="noindex" id="noindex" ng-model="data.webpage.noindex"> Don't Index This Page In Search Engines (<strong>noindex</strong>)
+              <input type="checkbox" name="noindex" id="noindex" ng-model="data.webpage.noindex"> Don't Index This Page
+              In Search Engines (<strong>noindex</strong>)
             </label>
           </div>
           <div class="checkbox">
             <label>
-              <input type="checkbox" name="nofollow" id="nofollow" ng-model="data.webpage.nofollow"> Don't Index Any Pages This Page Links To (<strong>nofollow</strong>)
+              <input type="checkbox" name="nofollow" id="nofollow" ng-model="data.webpage.nofollow"> Don't Index Any
+              Pages This Page Links To (<strong>nofollow</strong>)
             </label>
           </div>
           <div class="checkbox">
             <label>
-              <input type="checkbox" name="nosnippet" id="nosnippet" ng-model="data.webpage.nosnippet"> Don't Show A Snippet in Google Search Results (<strong>nosnippet</strong>)
+              <input type="checkbox" name="nosnippet" id="nosnippet" ng-model="data.webpage.nosnippet"> Don't Show A
+              Snippet in Google Search Results (<strong>nosnippet</strong>)
             </label>
           </div>
           <div class="checkbox">
             <label>
-              <input type="checkbox" name="noodp" id="noodp" ng-model="data.webpage.noodp"> Don't Show Description from ODP/DMOZ (<strong>noodp</strong>)
+              <input type="checkbox" name="noodp" id="noodp" ng-model="data.webpage.noodp"> Don't Show Description from
+              ODP/DMOZ (<strong>noodp</strong>)
             </label>
           </div>
           <div class="checkbox">
             <label>
-              <input type="checkbox" name="noarchive" id="noarchive" ng-model="data.webpage.noarchive"> Don't Show "Cached" Link on Google Search Results (<strong>noarchive</strong>)
+              <input type="checkbox" name="noarchive" id="noarchive" ng-model="data.webpage.noarchive"> Don't Show
+              "Cached" Link on Google Search Results (<strong>noarchive</strong>)
             </label>
           </div>
           <div class="checkbox">
             <label>
-              <input type="checkbox" name="noimageindex" id="noimageindex" ng-model="data.webpage.noimageindex"> Don't Show This Page As the Source For Images in Google Image Search (<strong>noimageindex</strong>)
+              <input type="checkbox" name="noimageindex" id="noimageindex" ng-model="data.webpage.noimageindex"> Don't
+              Show This Page As the Source For Images in Google Image Search (<strong>noimageindex</strong>)
             </label>
           </div>
         </form>
@@ -96,7 +102,21 @@
         </form>
       </div>
     </tab>
+    <tab>
+      <tab-heading><i class="fa fa-puzzle-piece"></i> Widgets</span></tab-heading>
+      <div>
+        <form novalidate name="webpageForm">
+          <div class="form-group">
+            <label for="tables_widget_yaml">Tables Data</label>
+            <textarea id="tables_widget_yaml" name="tables_widget_yaml" class="form-control" rows="15"
+                      ng-model="data.webpage.tables_widget_yaml"
+                      placeholder="YAML-formatted table data"></textarea>
+          </div>
+        </form>
+      </div>
+    </tab>
   </tabset>
 
-  <iframe class="webpage-frame" id="webpage-frame" ng-src="{{ data.webpage.url + '?editing_mode=1' | trustAsResourceUrl }}" disabled></iframe>
+  <iframe class="webpage-frame" id="webpage-frame"
+          ng-src="{{ data.webpage.url + '?editing_mode=1' | trustAsResourceUrl }}" disabled></iframe>
 </div>