2.1.2 release - Operator template changes

supportpal · Mar 31, 2017 · 577c393 · 577c393
1 parent 8ac9304
commit 577c393
Show file tree

Hide file tree

Showing 52 changed files with 1,277 additions and 647 deletions.
diff --git a/assets/operator/css/main.css b/assets/operator/css/main.css
@@ -63,6 +63,16 @@ hr {
     margin: 25px 0;
 }
 
+pre:not(.moz-signature) {
+    background: #f8f8f8;
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    font-size: 90%;
+    margin: 0;
+    padding: 1em;
+    white-space: pre-wrap;
+}
+
 .hide {
     display: none;
 }
@@ -169,7 +179,7 @@ hr {
     margin: 0;
 }
 
-.row .item {
+.row > .item {
     display: inline-block;
     font-size: 13px;
     padding-right: 25px;
@@ -1031,10 +1041,6 @@ ul.dropdown ul li:hover > ul {
     margin-bottom: 0;
 }
 
-#sidebar h3.collapsable div.arrow {
-    margin: 1px 0;
-}
-
 #sidebar .details > div {
     overflow: hidden;
     text-overflow: ellipsis;
@@ -1051,6 +1057,7 @@ ul.dropdown ul li:hover > ul {
 }
 
 #sidebar .details ul.recent-tickets {
+    margin-top: 5px;
     white-space: nowrap;
 }
 
@@ -1167,6 +1174,10 @@ ul.dropdown ul li:hover > ul {
     padding-left: 24px;
 }
 
+#sidebar .text-shorten {
+    word-wrap: break-word;
+}
+
 /* Main */
 
 #main {
@@ -1345,6 +1356,38 @@ table.settings .description.message-preview {
     height: 22px;
     overflow: hidden;
     position: absolute;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width: 95%;
+}
+
+table.settings .ticket-metadata {
+    color: #666;
+    text-align: right;
+}
+
+table.settings .ticket-metadata .fa {
+    font-size: 12px;
+    padding: 0;
+}
+
+table.settings .ticket-metadata .tag {
+    background: #bdc3c7;
+    margin-right: 0;
+    vertical-align: top;
+}
+
+table.settings .ticket-metadata .notes-count {
+    background: #f1c40f;
+}
+
+table.settings .ticket-metadata .messages-count.with-notes {
+    border-radius: 15px 0 0 15px;
+    margin-right: 1px;
+}
+
+table.settings .ticket-metadata .messages-count + .notes-count {
+    border-radius: 0 15px 15px 0;
 }
 
 table.settings td.relative {
@@ -1454,6 +1497,12 @@ ul.tabs li .badge, ul.tabs a .badge {
     cursor: pointer;
 }
 
+/* Departments */
+
+.department-templates h3 {
+    text-align: center;
+}
+
 /* Filters */
 
 .filters {
@@ -1698,6 +1747,12 @@ table.dataTable > tbody > tr.child span.dtr-title {
     min-width: 0 !important;
 }
 
+table.dataTable thead .sorting.hide-icon,
+table.dataTable thead .sorting_asc.hide-icon,
+table.dataTable thead .sorting_desc.hide-icon {
+    background-image: none;
+}
+
 /* Overwrite Sweetalert2 */
 
 .sweet-alert {
@@ -1811,6 +1866,10 @@ table.dataTable > tbody > tr.child span.dtr-title {
     background: #454545 !important;
 }
 
+.redactor-editor pre {
+    margin: 0 !important;
+}
+
 /* Redactor plugin lists */
 
 ul.redactor-search {
@@ -1936,12 +1995,12 @@ ul.attached-files .progress .bar {
     width: 0;
 }
 
-ul.attached-files .deleteAttachment {
+ul.attached-files .deleteAttachment, .attachments .deleteAttachment {
     cursor: pointer;
     margin: 5px 0;
 }
 
-ul.attached-files .deleteAttachment:hover {
+ul.attached-files .deleteAttachment:hover, .attachments .deleteAttachment:hover {
     color: #000;
 }
 
@@ -2029,6 +2088,20 @@ ul.attached-files .deleteAttachment:hover {
     opacity: 0.8;
 }
 
+.selectize-dropdown-content .optgroup_header {
+    background: #eee;
+    color: #777;
+    padding: 1px 8px 3px;
+}
+
+.selectize-control.plugin-remove_button [data-value].unremovable {
+    padding-right: 6px !important;
+}
+
+.selectize-control.plugin-remove_button [data-value].unremovable .remove {
+    display: none;
+}
+
 .ldap_operator {
     width: 40%;
     display: inline-block;

diff --git a/assets/operator/css/mobile.css b/assets/operator/css/mobile.css
@@ -286,11 +286,11 @@ html {
 	    margin-bottom: 0;
 	}
 
-	.row .item {
+	.row > .item {
 		margin-bottom: 25px;
 	}
 
-	.row .item:last-child {
+	.row > .item:last-child {
 		margin-bottom: 0;
 		padding-right: 25px;
 	}
@@ -330,6 +330,24 @@ html {
 		overflow-y: auto;
 	}
 
+	.department-templates .item50:last-child {
+		padding-right: 0;
+	}
+
+	.department-templates h3 {
+		text-align: left;
+	}
+
+	.department-templates .form-row label {
+		position: static;
+		text-align: left;
+		width: auto;
+	}
+
+	.department-templates .form-row .input-container {
+		margin-left: 0;
+	}
+
 }
 
 /*
@@ -356,6 +374,14 @@ html {
 		position: absolute;
 	}
 
+	.form-container.collapsed label {
+		margin-left: 20px;
+	}
+
+	.form-container.collapsed .description {
+		display: none;
+	}
+
 	ul.tabs {
 		border-bottom: 0;
     }
@@ -380,11 +406,11 @@ html {
         position: static;
     }
 
-    .row .item {
+    .row > .item {
 		padding-right: 0;
 	}
 
-	.row .item:last-child {
+	.row > .item:last-child {
 	    padding: 0;
 	}
 

diff --git a/assets/operator/css/ticket.css b/assets/operator/css/ticket.css
@@ -109,6 +109,7 @@ span.subject:hover:after {
 }
 
 .message .text img, .ticket-draft img {
+    height: auto;
     max-width: 100%;
 }
 
@@ -577,6 +578,23 @@ table.ticket-details .link:hover {
     border-bottom: 1px solid #c0392b;
 }
 
+table.ticket-details .create-new-user {
+    background: #fdf6ea;
+    border: 1px solid #ddd;
+    border-top: 0;
+    cursor: pointer;
+    font-size: 12px;
+    font-weight: normal;
+    line-height: 1em;
+    padding: 8px;
+    text-align: center;
+}
+
+table.ticket-details .create-new-user .fa {
+    font-size: 12px;
+}
+
+
 /* New ticket form */
 
 .user-ticket {
@@ -598,7 +616,7 @@ table.ticket-details .link:hover {
     font-weight: bold;
     line-height: 32px;
     margin: 2px 0;
-    width: 100px;
+    width: 110px;
 }
 
 .new-user input {

diff --git a/assets/operator/js/article.js b/assets/operator/js/article.js
@@ -26,6 +26,7 @@ function Article(parameters)
 
         // Initialise the visible type drop-down.
         $('select[name="category['+id+'][type]"]').selectize({
+            plugins: ['disableDelete'],
             onChange: function(value) {
                 // Hide the URL/views for this type
                 this.$input.parents('.form-container').find('.type-url, .type-views').remove();

diff --git a/assets/operator/js/department.js b/assets/operator/js/department.js
@@ -12,6 +12,7 @@ jQuery(function($){
      */
     var xhr;
     var $parent = $('select[name=parent]').selectize({
+        plugins: ['disableDelete'],
         valueField: 'id',
         labelField: 'name',
         searchField: 'name',
@@ -255,6 +256,16 @@ jQuery(function($){
     $('.email-piping').find('input[name$="[consume_all]"]').each(function () {
          setPipingPath(this);
     });
+
+    // Handle Disable User Replies.
+    $('input[name="disable_user_email_replies"]').on('change', function () {
+        $('#disableRepliesTemplate').toggle();
+    });
+
+    // Convert email template dropdowns to use selectize.
+    $('.department-templates').find('select').selectize({
+        plugins: ['disableDelete']
+    });
 });
 
 /**

diff --git a/assets/operator/js/filtering.js b/assets/operator/js/filtering.js
@@ -2,6 +2,11 @@ $(function() {
     // Toggle filtering
     $('.toggle-filtering').click(function() {
         $('.conditiongroup').toggle();
+
+        // If we're toggling to show and it's currently empty, insert new condition
+        if ($('.conditiongroup').is(':visible') && ! $('.conditiongroup .condition:visible').length) {
+            $('.conditiongroup .add-condition').click();
+        }
     });
 
     // Remove any items that have an empty dropdown

diff --git a/assets/operator/js/main.js b/assets/operator/js/main.js
@@ -65,15 +65,6 @@ $(document).ready(function () {
         $this.find('.hide').toggle();
     });
 
-    // For opening/collapsing sidebar boxes
-    $('#sidebar').on('click', 'h3.collapsable', function() {
-        if (!$('#sidebar').hasClass('sidebar-close') || $(window).width() > 960) {
-            $(this).find('.arrow .fa').toggleClass('fa-chevron-down fa-chevron-up');
-            $(this).toggleClass('closed');
-            $(this).next().toggle(500);
-        }
-    });
-
     // Toggle show/hide of the filters area
     $('.filter-results').on('click', function() {
         $('.filters').toggle();
@@ -99,6 +90,11 @@ $(document).ready(function () {
         });
     }
 
+    // Time ago.
+    if (typeof timeAgo !== 'undefined') {
+        timeAgo.render($('time.timeago'));
+    }
+
     /**
      * Global AJAX setup handler to add the CSRF token to ALL POST requests.
      */