locomotivecms 3.0.0.pre.beta.1 → 3.0.0.rc1

data/app/assets/javascripts/locomotive/views/inputs/rte/file_view.js.coffee

@@ -25,7 +25,7 @@ class Locomotive.Views.Inputs.Rte.FileView extends Backbone.View
     command = @editor.toolbar.commandMapping['insertFile:null']
     command.dialog = @
 
-    console.log "[insertFileView] attach_editor"
+    # console.log "[insertFileView] attach_editor"
 
   create_popover: ->
     @$popover.show()

data/app/assets/javascripts/locomotive/views/inputs/rte/link_view.js.coffee

@@ -21,7 +21,7 @@ class Locomotive.Views.Inputs.Rte.LinkView extends Backbone.View
     @$content.show()
     @$link.popover
       container:  '.main'
-      placement:  'left'
+      placement:  'top'
       content:    @$content
       html:       true
       template:   '<div class="popover" role="tooltip"><div class="arrow"></div><form class="simple_form"><div class="popover-content"></div></form></div>'

data/app/assets/javascripts/locomotive/views/inputs/rte_view.js.coffee.erb

@@ -33,7 +33,7 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
   open_styles_dialog: (event) ->
     $button = $(event.target).closest('a')
     @$style_popover = @$style_popover || ($button.popover
-      placement:  'bottom'
+      placement:  'top'
       content:    $button.next('.style-dialog-content').html()
       html:       true
       title:      undefined).popover('show')

data/app/assets/javascripts/locomotive/views/inputs/text_view.js.coffee

@@ -13,4 +13,7 @@ class Locomotive.Views.Inputs.TextView extends Backbone.View
   content_change: (event) ->
     PubSub.publish 'inputs.text_changed',
       view:     @
-      content:  $(event.target).val()
+      content:  @text_value($(event.target))
+
+  text_value: (textarea) ->
+    textarea.val()

data/app/assets/javascripts/locomotive/views/pages/list_view.js.coffee

@@ -72,6 +72,9 @@ class Locomotive.Views.Pages.ListView extends Backbone.View
   on_successful_sort: (data, status, xhr) ->
     Locomotive.notify decodeURIComponent($.parseJSON(xhr.getResponseHeader('X-Message'))), 'success'
 
+    # maybe some components depends on it (ex: refreshing a menu if live editing is on)
+    PubSub.publish 'pages.sorted'
+
   on_failed_sort: (data, status, xhr) ->
     Locomotive.notify decodeURIComponent($.parseJSON(xhr.getResponseHeader('X-Message'))), 'error'
 

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -7,7 +7,8 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
   namespace: null
 
   events:
-    'submit form': 'save'
+    'submit form':            'save'
+    'ajax:aborted:required':  'show_empty_form_message'
 
   render: ->
     @inputs = []
@@ -23,9 +24,11 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     @enable_datetime_inputs()
     @enable_text_inputs()
     @enable_rte_inputs()
+    @enable_markdown_inputs()
     @enable_tags_inputs()
     @enable_document_picker_inputs()
     @enable_select_inputs()
+    @enable_color_inputs()
 
     return @
 
@@ -50,6 +53,13 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     @change_state()
     @record_active_tab()
 
+  show_empty_form_message: (event) ->
+    message = @$('form').data('blank-required-fields-message')
+
+    Locomotive.notify message, 'error' if message?
+
+    @reset_state()
+
   enable_hover: ->
     $('.form-group.input').hover ->
       $(this).addClass('hovered')
@@ -110,6 +120,16 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
       view.render()
       self.inputs.push(view)
 
+  enable_markdown_inputs: ->
+    self = @
+    @$('.input.markdown').each ->
+      view = new Locomotive.Views.Inputs.MarkdownView(el: $(@))
+      view.render()
+      self.inputs.push(view)
+
+  enable_color_inputs: ->
+    @$('.input.color .input-group').colorpicker(container: false, align: 'right')
+
   enable_tags_inputs: ->
     @$('.input.tags input[type=text]').tagsinput()
 
@@ -127,6 +147,7 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     _.each @inputs, (view) -> view.remove()
     @$('.input.tags input[type=text]').tagsinput('destroy')
     @$('.input.select select').select2('destroy')
+    @$('.input.color .input-group').colorpicker('destroy')
 
   _stop_event: (event) ->
     event.stopPropagation() & event.preventDefault()

data/app/assets/javascripts/locomotive/views/shared/header_view.js.coffee

@@ -2,11 +2,11 @@ Locomotive.Views.Shared ||= {}
 
 class Locomotive.Views.Shared.HeaderView extends Backbone.View
 
-  el: 'nav.navbar'
+  el: '.header'
 
   initialize: ->
 
   render: ->
 
   height: ->
-    $(@el).outerHeight(true)
+    $(@el).outerHeight(true)

data/app/assets/stylesheets/locomotive/application.scss

@@ -2,6 +2,7 @@
 //= require select2-bootstrap
 //= require locomotive/cropper
 //= require locomotive/bootstrap-switch
+//= require locomotive/bootstrap-colorpicker
 //= require locomotive/bootstrap-datetimepicker
 //= require locomotive/bootstrap-tagsinput
 //= require locomotive/highlightjs/github
@@ -33,6 +34,7 @@
 @import "components/content_assets";
 @import "components/translations";
 @import "components/live_editing";
+@import "components/dashboard";
 @import "components/activity_feed";
 @import "components/developers";
 

data/app/assets/stylesheets/locomotive/base/_form.scss

@@ -5,10 +5,12 @@
 @import "./form/toggle";
 @import "./form/date";
 @import "./form/rte";
+@import "./form/markdown";
 @import "./form/select2";
 @import "./form/file_input";
 @import "./form/array_input";
 @import "./form/api_key";
+@import "./form/color_input";
 @import "./form/popover";
 @import "./form/document_picker";
 @import "./form/link";

data/app/assets/stylesheets/locomotive/base/form/_api_key.scss

@@ -16,7 +16,6 @@
 
         border: $form_input_control_border_size solid $form_input_control_border_color;
         @include border-radius($form_input_control_border_size);
-
       }
     }
 

data/app/assets/stylesheets/locomotive/base/form/_array_input.scss

@@ -84,6 +84,8 @@
           input[type=text] {
             @include box-shadow(none);
             padding-left: $padding-base-horizontal - $form_input_control_border_size;
+            background: white;
+            border: none;
           }
         }
 

data/app/assets/stylesheets/locomotive/base/form/_base.scss

@@ -9,7 +9,7 @@
       display: none;
     }
 
-    > .input {
+    .input {
       background: $form_input_background_color;
       padding: $form_input_padding;
       @include border-radius($form_input_radius);
@@ -48,6 +48,11 @@
       .help-inline {
         color: $form_input_help_color;
         font-size: $form_input_help_size;
+
+        b {
+          font-weight: bold;
+          color: #555;
+        }
       }
 
       .error-inline {
@@ -61,10 +66,16 @@
         border: $form_input_control_border_size solid $form_input_control_border_color;
         @include border-radius($form_input_control_border_size);
 
-        > input, > select {
+        > input, > select, .input-group > input {
           border: none;
           @include border-radius(0px);
         }
+
+        .input-group {
+          .input-group-addon {
+            border: none;
+          }
+        }
       }
 
       &.hovered {

data/app/assets/stylesheets/locomotive/base/form/_color_input.scss

@@ -0,0 +1,12 @@
+.simple_form {
+
+  fieldset .input.color {
+
+    .colorpicker-element .input-group-addon i {
+      width: 24px;
+      height: 24px;
+    }
+
+  }
+
+}

data/app/assets/stylesheets/locomotive/base/form/_markdown.scss

@@ -0,0 +1,292 @@
+.input.markdown {
+  .CodeMirror {
+    font-family: 'Noto Sans', sans-serif;
+    border-top: 1px solid rgba(0, 0, 0, 0.07);
+  }
+  .CodeMirror-scroll {
+    overflow: auto
+  }
+  .CodeMirror-lines {
+    padding: 4px 0
+  }
+  .CodeMirror pre {
+    padding: 0 4px;
+  }
+  .CodeMirror-scrollbar-filler {
+    background-color: white
+  }
+  .CodeMirror-gutters {
+    border-right: 1px solid #ddd;
+    background-color: #f7f7f7
+  }
+  .CodeMirror-linenumber {
+    padding: 0 3px 0 5px;
+    min-width: 20px;
+    text-align: right;
+    color: #999
+  }
+  .CodeMirror div.CodeMirror-cursor {
+    border-left: 1px solid black
+  }
+  .CodeMirror div.CodeMirror-secondarycursor {
+    border-left: 1px solid silver
+  }
+  .CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+    width: auto;
+    border: 0;
+    background: transparent;
+    background: rgba(0,200,0,0.4);
+  filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800)
+  }
+  .CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor:not(#nonsense_id) {
+  filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)
+  }
+  .cm-s-default .cm-keyword {
+    color: #708
+  }
+  .cm-s-default .cm-atom {
+    color: #219
+  }
+  .cm-s-default .cm-number {
+    color: #164
+  }
+  .cm-s-default .cm-def {
+    color: #00f
+  }
+  .cm-s-default .cm-variable {
+    color: black
+  }
+  .cm-s-default .cm-variable-2 {
+    color: #05a
+  }
+  .cm-s-default .cm-variable-3 {
+    color: #085
+  }
+  .cm-s-default .cm-property {
+    color: black
+  }
+  .cm-s-default .cm-operator {
+    color: black
+  }
+  .cm-s-default .cm-comment {
+    color: #a50
+  }
+  .cm-s-default .cm-string {
+    color: #a11
+  }
+  .cm-s-default .cm-string-2 {
+    color: #f50
+  }
+  .cm-s-default .cm-meta {
+    color: #555
+  }
+  .cm-s-default .cm-error {
+    color: #f00
+  }
+  .cm-s-default .cm-qualifier {
+    color: #555
+  }
+  .cm-s-default .cm-builtin {
+    color: #30a
+  }
+  .cm-s-default .cm-bracket {
+    color: #997
+  }
+  .cm-s-default .cm-tag {
+    color: #170
+  }
+  .cm-s-default .cm-attribute {
+    color: #00c
+  }
+  .cm-s-default .cm-header {
+    color: blue
+  }
+  .cm-s-default .cm-quote {
+    color: #090
+  }
+  .cm-s-default .cm-hr {
+    color: #999
+  }
+  .cm-s-default .cm-link {
+    color: #00c
+  }
+  .cm-negative {
+    color: #d44
+  }
+  .cm-positive {
+    color: #292
+  }
+  .cm-header, .cm-strong {
+    font-weight: bold
+  }
+  .cm-em {
+    font-style: italic
+  }
+  .cm-emstrong {
+    font-style: italic;
+    font-weight: bold
+  }
+  .cm-link {
+    text-decoration: underline
+  }
+  .cm-invalidchar {
+    color: #f00
+  }
+  div.CodeMirror span.CodeMirror-matchingbracket {
+    color: #0f0
+  }
+  div.CodeMirror span.CodeMirror-nonmatchingbracket {
+    color: #f22
+  }
+  .CodeMirror {
+    line-height: 1;
+    position: relative;
+    overflow: hidden
+  }
+  .CodeMirror-scroll {
+    margin-bottom: -30px;
+    margin-right: -30px;
+    padding-bottom: 30px;
+    padding-right: 30px;
+    height: 100%;
+    outline: none;
+    position: relative
+  }
+  .CodeMirror-sizer {
+    position: relative
+  }
+  .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler {
+    position: absolute;
+    z-index: 6;
+    display: none
+  }
+  .CodeMirror-vscrollbar {
+    right: 0;
+    top: 0;
+    overflow-x: hidden;
+    overflow-y: scroll
+  }
+  .CodeMirror-hscrollbar {
+    bottom: 0;
+    left: 0;
+    overflow-y: hidden;
+    overflow-x: scroll
+  }
+  .CodeMirror-scrollbar-filler {
+    right: 0;
+    bottom: 0;
+    z-index: 6
+  }
+  .CodeMirror-gutters {
+    position: absolute;
+    left: 0;
+    top: 0;
+    height: 100%;
+    padding-bottom: 30px;
+    z-index: 3
+  }
+  .CodeMirror-gutter {
+    height: 100%;
+    display: inline-block;
+  *zoom:1;
+  *display:inline
+  }
+  .CodeMirror-gutter-elt {
+    position: absolute;
+    cursor: default;
+    z-index: 4
+  }
+  .CodeMirror-lines {
+    cursor: text
+  }
+  .CodeMirror pre {
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+    -o-border-radius: 0;
+    border-radius: 0;
+    border-width: 0;
+    background: transparent;
+    font-family: inherit;
+    font-size: inherit;
+    margin: 0;
+    white-space: pre;
+    word-wrap: normal;
+    line-height: inherit;
+    line-height: 20px;
+    color: inherit;
+    z-index: 2;
+    position: relative;
+    overflow: visible
+  }
+  .CodeMirror-wrap pre {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: normal
+  }
+  .CodeMirror-linebackground {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 0
+  }
+  .CodeMirror-linewidget {
+    position: relative;
+    z-index: 2;
+    overflow: auto
+  }
+  .CodeMirror-widget {
+    display: inline-block
+  }
+  .CodeMirror-wrap .CodeMirror-scroll {
+    overflow-x: hidden
+  }
+  .CodeMirror-measure {
+    position: absolute;
+    width: 100%;
+    height: 0px;
+    overflow: hidden;
+    visibility: hidden
+  }
+  .CodeMirror-measure pre {
+    position: static
+  }
+  .CodeMirror div.CodeMirror-cursor {
+    position: absolute;
+    visibility: hidden;
+    border-right: none;
+    width: 0
+  }
+  .CodeMirror-focused div.CodeMirror-cursor {
+    visibility: visible
+  }
+  .CodeMirror-selected {
+    background: #d9d9d9
+  }
+  .CodeMirror-focused .CodeMirror-selected {
+    background: #d7d4f0
+  }
+  .cm-searching {
+    background: #ffa;
+    background: rgba(255,255,0,0.4)
+  }
+  .CodeMirror span {
+  *vertical-align:text-bottom
+  }
+
+  @media print {
+  .CodeMirror div.CodeMirror-cursor {
+    visibility: hidden
+  }
+  }
+
+  .CodeMirror .cm-header {
+    color: rgb(85, 85, 85);
+    font-size: 2rem;
+    line-height: 1.4em
+  }
+  .CodeMirror .cm-string, .CodeMirror .cm-link, .CodeMirror .cm-comment, .CodeMirror .cm-quote {
+    color: rgb(85, 85, 85);
+  }
+}