locomotivecms 4.0.0.alpha2 → 4.0.0.alpha3

data/app/assets/javascripts/locomotive/views/content_entries/index_view.js.coffee

@@ -6,10 +6,13 @@ class Locomotive.Views.ContentEntries.IndexView extends Backbone.View
 
   initialize: ->
     @list_view = new Locomotive.Views.Shared.ListView(el: @$('.big-list'))
+    @bulk_delete_view = new Locomotive.Views.Shared.BulkDeleteView()
 
   render: ->
     @list_view.render()
+    @bulk_delete_view.render()
 
   remove: ->
     @list_view.remove()
-    super()
+    @bulk_delete_view.remove()
+    super()

data/app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee

@@ -9,6 +9,7 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
   initialize: ->
     @attach_events_on_private_access_attribute()
     @display_locale_picker_only_for_seo()
+    @allow_url_redirections_expert_mode()
 
   attach_events_on_private_access_attribute: ->
     @$('#site_private_access').on 'switchChange.bootstrapSwitch', (event, state) ->
@@ -20,3 +21,8 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
 
     @$('a[data-toggle="tab"]').on 'shown.bs.tab', (event) ->
       if $(event.target).attr('href') == '#seo' then $picker.css(visibility: '') else $picker.css(visibility: 'hidden')
+
+  allow_url_redirections_expert_mode: ->
+    @$('#site_url_redirections_expert_mode').on 'switchChange.bootstrapSwitch', (event, state) ->
+      $inputs = $('.locomotive_site_url_redirections_plain_text, .locomotive_site_url_redirections')
+      $inputs.toggleClass('hide')

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

@@ -0,0 +1,27 @@
+Locomotive.Views.Shared ||= {}
+
+class Locomotive.Views.Shared.BulkDeleteView extends Backbone.View
+
+  el: '.main'
+
+  events:
+    'change .list-main-checkbox': 'tickOrUntickAll'
+    'change .item input[type=checkbox]': 'tickOrUntick'
+
+  tickOrUntickAll: (event) ->
+    @$('.item input[type=checkbox]').prop('checked', event.target.checked)
+    @refreshBulkDestroyFormState()
+
+  tickOrUntick: (event) ->
+    @$('.list-main-checkbox').prop('checked', false)
+    @refreshBulkDestroyFormState()
+
+  refreshBulkDestroyFormState: ->
+    ids = []
+    @$('.item input[type=checkbox]:checked').each(() -> ids.push($(this).val()))
+    @$('.bulk-destroy-action input[name=ids]').val(ids.join(','))
+
+    if @$('.item input[type=checkbox]:checked').size() > 0
+      @$('.bulk-destroy-action').removeClass('hidden')
+    else
+      @$('.bulk-destroy-action').addClass('hidden')

data/app/assets/javascripts/locomotive/views/translations/index_view.js.coffee

@@ -3,3 +3,9 @@ Locomotive.Views.Translations ||= {}
 class Locomotive.Views.Translations.IndexView extends Backbone.View
 
   el: '.main'
+
+  initialize: ->
+    @bulk_delete_view = new Locomotive.Views.Shared.BulkDeleteView()
+
+  render: ->
+    @bulk_delete_view.render()

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

@@ -103,6 +103,7 @@
 
 @import "old/search_bars";
 @import "new/notify";
+@import "new/checkbox";
 @import "old/list";
 @import "old/content_assets";
 @import "old/translations";

data/app/assets/stylesheets/locomotive/editor.css

@@ -848,39 +848,6 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 .DraftEditor-editorContainer,.DraftEditor-root,.public-DraftEditor-content{height:inherit;text-align:initial}.public-DraftEditor-content[contenteditable=true]{-webkit-user-modify:read-write-plaintext-only}.DraftEditor-root{position:relative}.DraftEditor-editorContainer{background-color:rgba(255,255,255,0);border-left:.1px solid transparent;position:relative;z-index:1}.public-DraftEditor-block{position:relative}.DraftEditor-alignLeft .public-DraftStyleDefault-block{text-align:left}.DraftEditor-alignLeft .public-DraftEditorPlaceholder-root{left:0;text-align:left}.DraftEditor-alignCenter .public-DraftStyleDefault-block{text-align:center}.DraftEditor-alignCenter .public-DraftEditorPlaceholder-root{margin:0 auto;text-align:center;width:100%}.DraftEditor-alignRight .public-DraftStyleDefault-block{text-align:right}.DraftEditor-alignRight .public-DraftEditorPlaceholder-root{right:0;text-align:right}.public-DraftEditorPlaceholder-root{color:#9197a3;position:absolute;z-index:0}.public-DraftEditorPlaceholder-hasFocus{color:#bdc1c9}.DraftEditorPlaceholder-hidden{display:none}.public-DraftStyleDefault-block{position:relative;white-space:pre-wrap}.public-DraftStyleDefault-ltr{direction:ltr;text-align:left}.public-DraftStyleDefault-rtl{direction:rtl;text-align:right}.public-DraftStyleDefault-listLTR{direction:ltr}.public-DraftStyleDefault-listRTL{direction:rtl}.public-DraftStyleDefault-ol,.public-DraftStyleDefault-ul{margin:16px 0;padding:0}.public-DraftStyleDefault-depth0.public-DraftStyleDefault-listLTR{margin-left:1.5em}.public-DraftStyleDefault-depth0.public-DraftStyleDefault-listRTL{margin-right:1.5em}.public-DraftStyleDefault-depth1.public-DraftStyleDefault-listLTR{margin-left:3em}.public-DraftStyleDefault-depth1.public-DraftStyleDefault-listRTL{margin-right:3em}.public-DraftStyleDefault-depth2.public-DraftStyleDefault-listLTR{margin-left:4.5em}.public-DraftStyleDefault-depth2.public-DraftStyleDefault-listRTL{margin-right:4.5em}.public-DraftStyleDefault-depth3.public-DraftStyleDefault-listLTR{margin-left:6em}.public-DraftStyleDefault-depth3.public-DraftStyleDefault-listRTL{margin-right:6em}.public-DraftStyleDefault-depth4.public-DraftStyleDefault-listLTR{margin-left:7.5em}.public-DraftStyleDefault-depth4.public-DraftStyleDefault-listRTL{margin-right:7.5em}.public-DraftStyleDefault-unorderedListItem{list-style-type:square;position:relative}.public-DraftStyleDefault-unorderedListItem.public-DraftStyleDefault-depth0{list-style-type:disc}.public-DraftStyleDefault-unorderedListItem.public-DraftStyleDefault-depth1{list-style-type:circle}.public-DraftStyleDefault-orderedListItem{list-style-type:none;position:relative}.public-DraftStyleDefault-orderedListItem.public-DraftStyleDefault-listLTR:before{left:-36px;position:absolute;text-align:right;width:30px}.public-DraftStyleDefault-orderedListItem.public-DraftStyleDefault-listRTL:before{position:absolute;right:-36px;text-align:left;width:30px}.public-DraftStyleDefault-orderedListItem:before{content:counter(ol0) ". ";counter-increment:ol0}.public-DraftStyleDefault-orderedListItem.public-DraftStyleDefault-depth1:before{content:counter(ol1) ". ";counter-increment:ol1}.public-DraftStyleDefault-orderedListItem.public-DraftStyleDefault-depth2:before{content:counter(ol2) ". ";counter-increment:ol2}.public-DraftStyleDefault-orderedListItem.public-DraftStyleDefault-depth3:before{content:counter(ol3) ". ";counter-increment:ol3}.public-DraftStyleDefault-orderedListItem.public-DraftStyleDefault-depth4:before{content:counter(ol4) ". ";counter-increment:ol4}.public-DraftStyleDefault-depth0.public-DraftStyleDefault-reset{counter-reset:ol0}.public-DraftStyleDefault-depth1.public-DraftStyleDefault-reset{counter-reset:ol1}.public-DraftStyleDefault-depth2.public-DraftStyleDefault-reset{counter-reset:ol2}.public-DraftStyleDefault-depth3.public-DraftStyleDefault-reset{counter-reset:ol3}.public-DraftStyleDefault-depth4.public-DraftStyleDefault-reset{counter-reset:ol4}
-#rap-overlay {
-  position: fixed;
-  display: block;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: transparent;
-  z-index: 2;
-  cursor: pointer;
-}
-
-.rap-manager,
-.rap-target-container {
-  display: inline-block;
-  position: relative;
-}
-
-.rap-left {
-  left: -20px !important;
-}
-.rap-bottom {
-  top: 15px !important;
-}
-.rap-top {
-  top: -15px !important;
-}
-.rap-right {
-  left: 20px !important;
-}
-
 .ReactCrop {
   position: relative;
   display: inline-block;
@@ -1060,7 +1027,11 @@
   margin: 1rem 0rem;
   background: #f7f7f7;
   box-shadow: 0 0 0 1px rgba(63, 63, 68, 0.05), 0 1px 3px 0 rgba(63, 63, 68, 0.15);
-  min-height: 4rem; }
+  min-height: 4rem;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none; }
   .editor-list-item.with-separator {
     margin-top: 4rem; }
   .editor-list-item--icon, .editor-list-item--image {
@@ -1144,6 +1115,10 @@
     padding: 0.5rem 0.8rem;
     border-radius: 3px;
     border: 1px solid #e3e4e7; }
+    .editor-input--text:-ms-input-placeholder {
+      color: #c8cbcf; }
+    .editor-input--text::placeholder {
+      color: #c8cbcf; }
   .editor-input--select {
     -moz-appearance: none;
     -webkit-appearance: none;
@@ -1186,6 +1161,23 @@
   -ms-flex-pack: center;
       justify-content: center; }
 
+.editor-input-url--info {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: center;
+      align-items: center; }
+  .editor-input-url--info-type {
+    margin-right: 1rem; }
+
+.editor-input-url--actions {
+  margin-top: 1rem;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: center;
+      align-items: center;
+  -ms-flex-pack: center;
+      justify-content: center; }
+
 .editor-input-radio--option input {
   margin-right: 1rem; }
 
@@ -1252,20 +1244,19 @@
 .editor-input-rich-text .rdw-link-wrapper {
   position: static; }
 
-.editor-input-rich-text .rdw-link-modal {
-  margin-top: 1rem;
-  left: 1rem;
-  right: 1rem;
-  width: auto;
-  height: auto;
-  box-shadow: none; }
-
 .editor-input-rich-text-counter {
   margin-top: 0.4rem;
   opacity: 0.6;
   text-align: right;
   font-size: 1.2rem; }
 
+.rdw-link-modal-actions {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-pack: center;
+      justify-content: center;
+  margin-bottom: 2rem; }
+
 .editor-view {
   height: 100%;
   display: -ms-flexbox;
@@ -1288,10 +1279,10 @@
       font-size: 2.1rem;
       color: #666;
       padding: 1rem 0; }
-    .editor-view--header-subTitle {
+    .editor-view--header-sub-title {
       font-size: 1.4rem;
       color: #91979f; }
-    .editor-view--header-mainTitle {
+    .editor-view--header-main-title {
       font-size: 2.1rem;
       color: #666; }
     .editor-view--header-back-btn {
@@ -1597,7 +1588,8 @@
     transform: translate(-50%, -50%);
     padding: 0rem 2rem;
     background: #ffffff;
-    color: #333333; }
+    color: #333333;
+    border-radius: 3px; }
   .modal-window-header {
     font-size: 2.1rem;
     color: #666;
@@ -1608,15 +1600,16 @@
     color: #333333; }
 
 .modal-close {
-  color: #aaa;
-  line-height: 50px;
-  font-size: 2rem;
   position: absolute;
-  right: 0;
-  text-align: center;
   top: 0;
+  right: 0rem;
   width: 70px;
+  padding-right: 2rem;
+  line-height: 50px;
+  text-align: right;
   text-decoration: none;
+  font-size: 2rem;
+  color: #aaa;
   cursor: pointer; }
   .modal-close:hover {
     color: #000; }
@@ -1740,71 +1733,31 @@
     max-height: 30rem; } }
 
 .url-picker {
-  width: 100%; }
-
-.url-picker-info {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-      align-items: center;
-  margin-bottom: 1rem; }
-  .url-picker-info--value {
-    -ms-flex-positive: 1;
-        flex-grow: 1; }
-    .url-picker-info--value .label {
-      position: relative;
-      top: -2px;
-      border-radius: 0px;
-      background-color: #333333; }
-  .url-picker-info--actions {
-    display: -ms-flexbox;
-    display: flex;
-    margin-left: 1rem; }
-    .url-picker-info--actions .btn {
-      margin-left: 0.5rem; }
-
-.url-picker-input {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-      align-items: center;
-  margin-bottom: 1rem; }
-  .url-picker-input--autocomplete {
-    -ms-flex-positive: 1;
-        flex-grow: 1; }
-    .url-picker-input--autocomplete .rap-manager, .url-picker-input--autocomplete .rap-target-container {
-      width: 100%; }
-    .url-picker-input--autocomplete .rap-popover-pad {
-      width: 30rem;
-      padding: 0; }
-  .url-picker-input--actions {
+  padding: 2rem; }
+  .url-picker-type-list {
     display: -ms-flexbox;
     display: flex;
-    margin-left: 1rem; }
-    .url-picker-input--actions .btn {
-      margin-left: 0.5rem; }
-
-.url-picker-new-window {
-  font-size: 1.2rem;
-  color: #91979f;
-  text-align: right; }
-
-.url-picker-resource {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-      align-items: center;
-  padding: 0.7rem 1rem;
-  border-bottom: 1px solid #e3e4e7; }
-  .url-picker-resource--type {
-    margin-right: 1rem; }
-    .url-picker-resource--type .label {
-      position: relative;
-      top: -2px;
-      border-radius: 0px;
-      background-color: #333333; }
-  .url-picker-resource--label {
-    cursor: pointer; }
+    margin-bottom: 2rem; }
+  .url-picker-type-option {
+    -ms-flex: 1 1;
+        flex: 1 1; }
+    .url-picker-type-option--checked label {
+      color: #000 !important; }
+    .url-picker-type-option input {
+      margin-right: 1rem; }
+    .url-picker-type-option label {
+      font-weight: normal;
+      color: #91979f;
+      margin-bottom: 0;
+      cursor: pointer; }
+  .url-picker .react-autosuggest__input:-ms-input-placeholder {
+    color: #c8cbcf; }
+  .url-picker .react-autosuggest__input::placeholder {
+    color: #c8cbcf; }
+
+.modal-window .url-picker {
+  min-width: 42rem;
+  padding: 2rem 0 0 0; }
 
 .locale-switcher {
   margin-top: 0.2rem; }
@@ -1942,6 +1895,59 @@
   100% {
     transform: scale(1); } }
 
+.react-autosuggest {
+  position: relative; }
+  .react-autosuggest--loading .react-autosuggest__spinner {
+    display: block; }
+  .react-autosuggest--loading .react-autosuggest__suggestions-container {
+    display: none; }
+  .react-autosuggest__container {
+    position: relative; }
+  .react-autosuggest__spinner {
+    display: none;
+    position: absolute;
+    right: 1rem;
+    top: 0.5rem;
+    z-index: 2; }
+  .react-autosuggest__input {
+    width: 100%;
+    padding: 0.5rem 0.8rem;
+    border: 1px solid #e3e4e7;
+    border-radius: 3px;
+    -webkit-appearance: none; }
+    .react-autosuggest__input::-ms-clear {
+      display: none; }
+    .react-autosuggest__input--open {
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0; }
+    .react-autosuggest__input--focused {
+      outline: none; }
+  .react-autosuggest__suggestions-container {
+    display: none; }
+    .react-autosuggest__suggestions-container--open {
+      display: block;
+      position: absolute;
+      top: 31px;
+      width: 100%;
+      border: 1px solid #e3e4e7;
+      background-color: #fff;
+      border-bottom-left-radius: 3px;
+      border-bottom-right-radius: 3px;
+      z-index: 2; }
+  .react-autosuggest__suggestions-list {
+    margin: 0;
+    padding: 0;
+    list-style-type: none; }
+  .react-autosuggest__suggestion {
+    cursor: pointer;
+    padding: 0.5rem 0.8rem;
+    border-top: 1px solid #ddd; }
+    .react-autosuggest__suggestion--first {
+      border-top: 0; }
+    .react-autosuggest__suggestion--highlighted {
+      background-color: #1c77c3;
+      color: #fff; }
+
 #editor-app, #editor-app .container-fluid {
   height: 100%; }
   #editor-app .actionbar, #editor-app .container-fluid .actionbar {

data/app/assets/stylesheets/locomotive/new/_checkbox.scss

@@ -0,0 +1,38 @@
+.checkbox {
+  display: inline-block;
+  margin: 0;
+  font-size: 0; /* remove empty space */
+
+  input[type=checkbox] {
+    display: none;
+  }
+
+  label {
+    padding: 0;
+    min-height: 2rem;
+  }
+
+  input[type=checkbox] + label:before {
+    display: inline-block;
+    height: 2rem;
+    width: 2rem;
+    line-height: 2rem;
+    font-family: 'Font Awesome 5 Free';
+    font-weight: 900;
+    font-size: 1.2rem;
+    text-align: center;
+    transition: all $base-transition-speed linear;
+  }
+
+  input[type=checkbox] + label:before {
+    border: 1px solid $gray-light;
+    content: " ";
+    color: $gray-light;
+  }
+
+  input[type=checkbox]:checked + label:before {
+    content: "\f00c";
+    color: $gray-darker;
+    border: 1px solid $gray-darker;
+  }
+}

data/app/assets/stylesheets/locomotive/old/_activity_feed.scss

@@ -1,6 +1,7 @@
 $activity_feed_icon_bg_color: $brand-primary;
 $activity_feed_title_color: #595959;
 $activity_feed_time_color: #949999;
+$activity_feed_locale_bg_color: #1E2022;
 
 .activity-feed {
   padding-top: 1px;
@@ -36,6 +37,15 @@ $activity_feed_time_color: #949999;
       span.sentence {
         font-weight: normal;
       }
+      span.locale {
+        display: inline-block;
+        background: $activity_feed_locale_bg_color;
+        padding: 2px 4px;
+        margin-left: 10px;
+        font-weight: normal;
+        text-transform: uppercase;
+        color: #fff;
+      }
     }
     .additional-information {
       padding-left: 30px;