pages_core 3.4.3 → 3.5.1

data/app/assets/stylesheets/pages/admin/components/textarea.scss

@@ -0,0 +1,76 @@
+textarea.rich {
+  margin-top: -32px;
+  padding-top: 8px + 32px;
+  width: 100%;
+}
+
+.rich-text-toolbar {
+  @extend %clearfix;
+  position: relative;
+  display: block;
+  list-style: none;
+  border-top: 1px solid #d7d7d7;
+  border-bottom: 1px solid #d7d7d7;
+  background-color: #fafafa;
+  margin: 0px 1px 0px 1px;
+  padding: 0px 10px 0px 0px;
+  line-height: 30px;
+  width: auto;
+  box-shadow: 0px 1px 1px #fff;
+
+  li {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  .button {
+    float: left;
+
+    a {
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      display: block;
+      cursor: pointer;
+      width: 35px;
+      float: left;
+      border-left: 1px solid #fff;
+      border-right: 1px solid #d7d7d7;
+      color: #555;
+      font-size: 14px;
+      background-color: #F6F6F6;
+      &:focus,
+      &:hover {
+        color: #000;
+        background: #fdfdfd;
+      }
+
+      // font-awesome doesn't have h1-h6, so we'll apply some tricks
+      &.header {
+        vertical-align: bottom;
+        i {
+          margin-left: -6px;
+        }
+        i:after {
+          font-family: Helvetica, Georgia, serif;
+          font-weight: bold;
+          font-size: 13px;
+          display: inline-block;
+          position: absolute;
+          bottom: 3px;
+        }
+        &.h1 i::after { content: "1" }
+        &.h2 i::after { content: "2" }
+        &.h3 i::after { content: "3" }
+        &.h4 i::after { content: "4" }
+        &.h5 i::after { content: "5" }
+        &.h6 i::after { content: "6" }
+      }
+    }
+
+    span {
+      display: none;
+    }
+  }
+}

data/app/assets/stylesheets/pages/admin/controllers/pages.scss

@@ -0,0 +1,196 @@
+.drag-handle {
+  cursor: pointer;
+  float: left;
+  vertical-align: middle;
+  margin-top: 5px;
+  margin-left: 6px;
+  width: 13px;
+  height: 16px;
+  background-image: image-url("pages/admin/drag-icon.png");
+}
+
+.page-list {
+  float: left;
+  list-style-type:  none;
+  padding: 0;
+  margin: 0;
+  font-size: 1.2em;
+  margin-left: -8px;
+  margin-top: 16px;
+
+  .page-listing {
+    border: 1px solid transparent;
+    padding: 3px 8px 2px 8px !important;
+  }
+
+  ul {
+    border-left: 1px dotted #ccc !important;
+    margin-left: 12px !important;
+    padding-left: 8px !important
+  }
+
+  ul li {
+    overflow: auto;
+  }
+
+  .page {
+    padding: 4px 8px;
+    line-height: 17px;
+    float: left;
+
+    .status {
+      font-weight: normal;
+    }
+
+    a.page-name,
+    a.page-name:visited {
+      text-decoration: none;
+      color: #222;
+    }
+    a.page-name:hover {
+      text-decoration: underline;
+    }
+
+    &.hidden {
+      a.page-name {
+        color: #666;
+      }
+    }
+
+    &:hover {
+      background: #ffd;
+      border: 1px solid #dda;
+      .status {
+        display: none;
+      }
+    }
+  }
+
+  .page-without-locale {
+    color: #888;
+  }
+
+  li {
+    font-weight:  bold;
+    margin:  0;
+    padding: 0;
+    clear: both;
+  }
+
+  li li {
+    font-weight: normal;
+    font-size:  12px;
+    padding: 0;
+  }
+
+  ul {
+    clear: both;
+    list-style-type:  none;
+    border-left:  1px dashed #ccc;
+    margin:  0 0 0px 12px;
+    padding: 0 0 0 12px;
+  }
+
+  .hover {
+    background: #cef;
+  }
+
+  .drag-handle {
+    display: none;
+  }
+
+  &.reorder .drag-handle {
+    display: block;
+  }
+}
+
+.news-item-list {
+  .name {
+    line-height: 1.5;
+  }
+
+  .name .name_link {
+    font-weight: bold;
+  }
+
+  .name .status_label {
+    color: #666;
+  }
+
+  .draft,
+  .hidden,
+  .autopublish,
+  .reviewed {
+    background: #f4f4f4;
+  }
+
+  .pinned .name {
+    background: #fff8e8;
+    background: transparent image-url("pages/admin/list-table-pin-blue.gif") no-repeat 13px 50%;
+  }
+
+  .draft .name,
+  .hidden .name,
+  .autopublish .name,
+  .autopublish .reviewed {
+    background: transparent image-url("pages/admin/list-table-pin-disabled.gif") no-repeat 13px 50%;
+  }
+}
+
+.edit-page {
+  padding-top: 1px;
+  width: auto;
+
+  .hidden-options {
+    display: none;
+  }
+
+  .advanced-options {
+    visibility: none;
+  }
+
+  main & input[type=text],
+  main & textarea {
+    width: 100%;
+    max-width: 100%;
+  }
+
+  main & input.page_title {
+    font-weight: bold;
+    font-size: 1.4em;
+    color: #222;
+  }
+}
+
+
+.file-list {
+  list-style-type: none;
+  margin-left: 0;
+  margin-right: 0;
+  padding: 0;
+  .embed-code {
+    display: inline-block;
+    width: 60px;
+    margin-right: 10px;
+  }
+  li {
+    line-height: 30px;
+    border-top: 1px solid #ddd;
+    &:first-child {
+      border-top: 0px;
+    }
+    .actions {
+      float: right;
+    }
+    .drag-handle {
+      margin-right: 10px;
+    }
+  }
+  .placeholder {
+    height: 30px;
+  }
+  .ui-sortable-helper {
+    border: 1px solid #ddd !important;
+    background: rgba(250, 250, 250, 0.8);
+  }
+}

data/app/assets/stylesheets/pages/admin/mixins/breakpoints.scss

@@ -0,0 +1,21 @@
+@mixin breakpoint-min($width) {
+  @media screen and (min-width: ($width + 1px)) {
+    @content;
+  }
+}
+
+@mixin breakpoint-max($width) {
+  @media screen and (max-width: $width) {
+    @content;
+  }
+}
+
+@mixin breakpoint-min-max($min-width, $max-width) {
+  @media screen and (min-width: ($min-width + 1px)) and (max-width: ($max-width)) {
+    @content;
+  }
+}
+
+@mixin breakpoint-mobile($offset: 0px) {
+  @include breakpoint-max(($breakpoint-mobile + $offset)) { @content; }
+}

data/app/assets/stylesheets/pages/admin/mixins/clearfix.scss

@@ -0,0 +1,7 @@
+%clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}

data/app/assets/stylesheets/pages/admin/mixins/gradients.scss

@@ -0,0 +1,7 @@
+@mixin vertical-gradient($start, $stop) {
+  background: $start;
+  background: -moz-linear-gradient(top,  $start 0%, $stop 100%);
+  background: -webkit-linear-gradient(top,  $start 0%,$stop 100%);
+  background: linear-gradient(to bottom,  $start 0%,$stop 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$start', endColorstr='$stop',GradientType=0 );
+}

data/app/assets/stylesheets/pages/admin/vars.scss

@@ -0,0 +1,8 @@
+$breakpoint-mobile: 720px;
+
+$c-link: #1d7195;
+$c-link-hover: darken($c-link, 10%);
+$c-create: #19ac1e;
+$c-create-hover: darken($c-create, 10%);
+$c-delete: #a21402;
+$c-delete-hover: darken($c-delete, 10%);

data/app/controllers/admin/invites_controller.rb

@@ -2,7 +2,7 @@ module Admin
   class InvitesController < Admin::AdminController
     before_action :require_authentication, except: [:accept, :show]
     before_action :find_invite, only: [:show, :edit, :update, :destroy, :accept]
-    before_action :require_valid_token,    only: [:show, :accept]
+    before_action :require_valid_token, only: [:show, :accept]
 
     require_authorization(
       Invite,
@@ -39,11 +39,8 @@ module Admin
     def create
       @invite = current_user.invites.create(invite_params)
       if @invite.valid?
-        AdminMailer.invite(
-          @invite,
-          admin_invite_with_token_url(@invite, @invite.token)
-        ).deliver_now
-        @invite.update(sent_at: Time.now)
+        deliver_invite(@invite)
+        @invite.update(sent_at: Time.now.utc)
         redirect_to admin_invites_url
       else
         render action: :new
@@ -58,6 +55,13 @@ module Admin
 
     private
 
+    def deliver_invite(invite)
+      AdminMailer.invite(
+        invite,
+        admin_invite_with_token_url(invite, invite.token)
+      ).deliver_now
+    end
+
     def find_invite
       @invite = Invite.find(params[:id])
     end

data/app/controllers/admin/page_files_controller.rb

@@ -18,9 +18,7 @@ module Admin
     def reorder
       if params[:ids]
         files = Array(params[:ids]).map { |id| PageFile.find(id) }
-        files.each_with_index do |file, index|
-          file.update(position: index)
-        end
+        files.each_with_index { |f, i| f.update(position: i) }
       end
       if request.xhr?
         render text: "ok"
@@ -46,11 +44,11 @@ module Admin
     end
 
     def update
-      if @page_file.update(page_file_params)
-        flash[:notice] = "File updated"
-      else
-        flash[:notice] = "Error updating file!"
-      end
+      flash[:notice] = if @page_file.update(page_file_params)
+                         "File updated"
+                       else
+                         "Error updating file!"
+                       end
       redirect_to_page
     end
 

data/app/controllers/admin/page_images_controller.rb

@@ -49,20 +49,12 @@ module Admin
       else
         @page.page_images.create(page_image_params.merge(locale: @locale))
       end
-      redirect_to(admin_page_path(@locale, @page, anchor: "images"))
+      respond_with_page_image(@page_image)
     end
 
     def update
       if @page_image.update(page_image_params)
-        respond_to do |format|
-          format.html do
-            flash[:notice] = "The image was updated"
-            redirect_to(admin_page_path(@locale, @page, anchor: "images"))
-          end
-          format.json do
-            render json: @page_image.to_json
-          end
-        end
+        respond_with_page_image(@page_image)
       else
         render action: :edit
       end
@@ -70,15 +62,7 @@ module Admin
 
     def destroy
       @page_image.destroy
-      respond_to do |format|
-        format.html do
-          flash[:notice] = "The image was deleted"
-          redirect_to(admin_page_path(@locale, @page, anchor: "images"))
-        end
-        format.json do
-          render json: @page_image.to_json
-        end
-      end
+      respond_with_page_image(@page_image)
     end
 
     protected
@@ -112,5 +96,16 @@ module Admin
     def page_images_params?
       params[:page_images] ? true : false
     end
+
+    def respond_with_page_image(page_image)
+      respond_to do |format|
+        format.html do
+          redirect_to(admin_page_path(@locale, @page, anchor: "images"))
+        end
+        format.json do
+          render json: page_image.to_json
+        end
+      end
+    end
   end
 end