Skip to content
Permalink
Browse files

2.2.0-beta.1 release - Frontend template changes

  • Loading branch information
jshah4517 committed Sep 5, 2017
1 parent a51ac05 commit 95869cf23d342255e1b31d44f274802a5c005f24
Showing with 308 additions and 231 deletions.
  1. +28 −18 assets/frontend/css/main.css
  2. +46 −0 assets/frontend/css/redactor.css
  3. +8 −0 assets/frontend/css/ticket.css
  4. +9 −2 assets/frontend/js/main.js
  5. +9 −1 assets/frontend/js/organisation.js
  6. +1 −1 assets/frontend/js/ticket.js
  7. +1 −1 templates/frontend/default/core/dashboard.twig
  8. +9 −2 templates/frontend/default/footer.twig
  9. +9 −5 templates/frontend/default/forms/customfields.twig
  10. +1 −98 templates/frontend/default/header.twig
  11. +106 −0 templates/frontend/default/navigation.twig
  12. +2 −2 templates/frontend/default/selfservice/article.twig
  13. +1 −1 templates/frontend/default/selfservice/comment.twig
  14. +3 −1 templates/frontend/default/selfservice/sidebar.twig
  15. +11 −76 templates/frontend/default/sidebar.twig
  16. +1 −1 templates/frontend/default/ticket/entire_message.twig
  17. +10 −1 templates/frontend/default/ticket/feedback.twig
  18. +3 −2 templates/frontend/default/ticket/forms/newticket_step3.twig
  19. +2 −2 templates/frontend/default/ticket/message.twig
  20. +11 −4 templates/frontend/default/ticket/ticket.twig
  21. +3 −3 templates/frontend/default/user/change_password.twig
  22. +9 −4 templates/frontend/default/user/forms/organisation.twig
  23. +2 −2 templates/frontend/default/user/forms/user_profile.twig
  24. +4 −0 templates/frontend/default/user/organisation.twig
  25. +5 −0 templates/frontend/default/user/organisation_add.twig
  26. +5 −0 templates/frontend/default/user/profile.twig
  27. +5 −0 templates/frontend/default/user/register.twig
  28. +2 −2 templates/frontend/default/user/resetconfirm.twig
  29. +2 −2 templates/frontend/default/user/setpassword.twig
@@ -545,7 +545,7 @@ ul.details .fa {
ul.catlist {
list-style: none;
margin: 0;
min-height: 71px;
min-height: 80px;
padding: 0 15px;
}

@@ -623,6 +623,7 @@ ul.related-list li {

#desk_sidebar ul.ad_nav li {
padding: 0;
white-space: nowrap;
}

#desk_sidebar ul.ad_nav li a {
@@ -650,8 +651,14 @@ ul.related-list li {
padding: 6px 10px 6px 30px;
}

#desk_sidebar ul.ad_nav .nav-item {
overflow: hidden;
text-overflow: ellipsis;
}

#desk_sidebar ul.ad_nav .badge {
background: #2C6384;
margin: 2px 0 0 5px;
float: right;
}

@@ -790,6 +797,7 @@ table.settings .description {

table.settings .badge {
padding: 3px 8px;
white-space: nowrap;
}

/* Dashboard */
@@ -1421,6 +1429,9 @@ button.show-children {
.selectize-input {
border: 1px solid #e0e0e0 !important;
border-top-color: #d0d0d0 !important;
-moz-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .1) !important;
-webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .1) !important;
box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .1) !important;
}

.selectize-control.plugin-remove_button [data-value].unremovable {
@@ -1482,11 +1493,12 @@ button.show-children {
color: #fff;
}

.has-error input {
.has-error input, input.has-error {
border-color: #e74c3c;
}

.has-error .field-error,
input.has-error ~ .field-error,
.recaptcha_input_area .field-error:not(:empty) {
background: #e74c3c;
-moz-border-radius: 3px;
@@ -1503,6 +1515,7 @@ button.show-children {
}

.has-error .field-error:before,
input.has-error ~ .field-error:before,
.recaptcha_input_area .field-error:not(:empty):before {
border-bottom: 6px solid transparent;
border-top: 6px solid transparent;
@@ -1514,6 +1527,7 @@ button.show-children {
}

.has-error .field-error.field-error-below,
input.has-error ~ .field-error.field-error-below,
.has-error .redactor-box + .field-error {
display: table;
margin-left: 0;
@@ -1522,6 +1536,7 @@ button.show-children {
}

.has-error .field-error.field-error-below:before,
input.has-error ~ .field-error.field-error-below:before,
.has-error .redactor-box + .field-error:before {
content: none;
}
@@ -1532,6 +1547,17 @@ input.datepicker {
line-height: 21px;
}

/* hideShowPassword */
.hideShowPassword-wrapper {
display: inline-block !important;
width: auto !important; /* Needed for IE */
}

.hideShowPassword-wrapper input::-ms-reveal,
.hideShowPassword-wrapper input::-ms-clear {
display: none !important;
}

/* jQuery UI Tooltip */

.ui-tooltip, .ui-tooltip .arrow:after {
@@ -1584,22 +1610,6 @@ input.datepicker {
top: auto;
}

/* Redactor */

#redactor-modal-box button {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
height: auto;
}

.redactor-editor pre {
margin: 0 !important;
}

/* Fix for iframe generated by recaptcha */

iframe[src="about:blank"] {
@@ -26,6 +26,11 @@
padding: 15px;
}

.redactor-editor[contenteditable="false"] {
filter: alpha(opacity=60);
opacity: 0.6;
}

.redactor-toolbar {
background: #fafafa;
-moz-border-radius: 3px 3px 0 0;
@@ -52,4 +57,45 @@

.redactor-toolbar-tooltip {
background: #454545;
}

#redactor-modal-box button {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
height: auto;
}

.redactor-editor pre {
margin: 0 !important;
}

.form-customfields .redactor-box {
border: 0;
margin-bottom: 0;
}

.form-customfields .redactor-box, .form-customfields .redactor-editor {
min-height: 75px;
}

.form-customfields .redactor-editor {
background: #fff;
border: 1px solid #e0e0e0;
border-top-color: #d0d0d0;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .1);
-webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .1);
box-shadow: inset 1px 1px 1px rgba(0, 0, 0, .1);
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
line-height: 1.4em;
margin-bottom: 0 !important;
padding: 8px !important;
}
@@ -47,6 +47,14 @@
word-wrap: break-word;
}

.message .text * {
height: auto !important;
}

.message .text .hide {
display: block;
}

.message .text table {
border: none;
border-collapse: collapse;
@@ -14,12 +14,19 @@ $(document).ready(function() {

// Change language
$('select[name=language]').change(function(e) {
var valueSelected = this.value;
var returnTo = $("option:selected", this).data('return-to'),
valueSelected = this.value;

$.post(laroute.route('core.set.language'), {
language: valueSelected
}).always(function(data) {
window.location.reload();
if (typeof returnTo !== 'undefined' && returnTo !== '') {
window.location.href = returnTo;
} else {
// Add the language in the URL and reload the page
var separator = (window.location.search.indexOf("?") === -1) ? "?" : "&";
window.location.search += separator + 'lang=' + valueSelected;
}
});
});

@@ -32,6 +32,14 @@ $(document).ready(function() {
Lang.get('messages.success_deleted', {'item': Lang.choice('user.user', 1)}),
'success'
);

// Remove option from owner dropdown. We check for length to ensure the dropdown exists, it
// doesn't for normal managers.
if ($ownerSelectize.length !== 0) {
$ownerSelectize[0].selectize.removeOption($this.data('user'));
}

// Remove row
row.remove();
} else {
swal(
@@ -52,7 +60,7 @@ $(document).ready(function() {
});
});

$('select[name="owner"]').selectize({
var $ownerSelectize = $('select[name="owner"]').selectize({
searchField: [ 'formatted_name', 'email' ],
render: {
item: function(item, escape) {
@@ -31,7 +31,7 @@ $(document).ready(function() {
$.get(route)
.success(function (ajax) {
// Load the message in, it should already be sanitized.
$message.find('.text').html(ajax.data.text);
$message.find('.text').html(ajax.data.purified_text);
})
.fail(function () {
swal(Lang.get('messages.error'), Lang.get('messages.error_loading_message'), 'error');
@@ -23,7 +23,7 @@
<p>{{ Lang.get('core.submit_ticket_desc') }}</p>
</div>

{% if not auth_check() and Config.get('channel.web.unauthenticated_users') %}
{% if not auth_check() and Config.get('channel.web.settings.unauthenticated_users') %}
<div class="desk_section">
<a href="{{ route('ticket.frontend.track') }}">
<img src="{{ asset_rev('resources/assets/frontend/icons/binoculars.png') }}" class="icon left"
@@ -1,8 +1,15 @@
{% if Config.get('settings.language_frontend_toggle') == 1 %}
<div class="language-footer hide">
{{ Lang.choice('general.language', 1) }}&nbsp;
{{ form_select('language', languages,
auth_check() and auth_user().language_code is not null ? auth_user().language_code : LanguageFactory.getUserDefault()) }}
<select name="language">
{% for code, language in languages %}
<option value="{{ code }}"
{% if code == App.getLocale() %}selected="selected"{% endif %}
{% if attribute(returnTo, code) is defined %}data-return-to="{{ attribute(returnTo, code) }}"{% endif %}>
{{ language }}
</option>
{% endfor %}
</select>
</div>
{% endif %}

@@ -6,7 +6,7 @@
{% set customfield = customfield|merge({'locked': 1}) %}
{% endif %}

<div class="form-row" data-field="{{ customfield['id'] }}">
<div class="form-row form-customfields" data-field="{{ customfield['id'] }}">
{{ form_label('customfield[' ~ customfield['id'] ~ ']', customfield['name']) }}
<div class="input-container">
{% if customfield['type'] == 0 %}
@@ -55,8 +55,9 @@
customfield['value'], (customfield['value'] is not empty and customfield['locked'] ? {'disabled': 'disabled'} : {})) }}

{% elseif customfield['type'] == 6 %}
{# The min-width is required for IE as otherwise password fields look incorrect with hideShowPassword, do not delete! #}
{{ form_password('customfield[' ~ customfield['id'] ~ ']',
(customfield['value'] is not empty and customfield['locked'] ? {'disabled': 'disabled', 'size': '50%'} : {'size': '50%'}))
(customfield['value'] is not empty and customfield['locked'] ? {'disabled': 'disabled'} : {})|merge({ 'autocomplete': 'new-password', 'style': 'min-width: 300px; width: 50%;' }))
}} &nbsp; {% if customfield['value'] is not empty %}<span class="light">({{ Lang.get('user.only_enter_to_change') }})</span>{% endif %}

{% elseif customfield['type'] == 7 %}
@@ -73,10 +74,10 @@

{% elseif customfield['type'] == 8 %}
{{ form_text('customfield[' ~ customfield['id'] ~ ']', customfield['value'],
(customfield['value'] is not empty and customfield['locked'] ? {'disabled': 'disabled', 'size': '50%'} : {'size': '50%'})) }}
(customfield['value'] is not empty and customfield['locked'] ? {'disabled': 'disabled', 'style': 'width: 50%;'} : {'style': 'width: 50%;'})) }}

{% elseif customfield['type'] == 9 %}
{{ form_textarea('customfield[' ~ customfield['id'] ~ ']', customfield['value'],
{{ form_redactor('customfield[' ~ customfield['id'] ~ ']', customfield['value'],
(customfield['value'] is not empty and customfield['locked'] ? {'rows': 5, 'style': 'width:100%', 'disabled': 'disabled'} : {'rows': 5, 'style': 'width:100%'})) }}

{% elseif customfield['type'] == 10 %}
@@ -102,7 +103,10 @@
</div>
{% endif %}
{% if customfield['description'] is not empty %}
<br /><span class="light">{{ customfield['description'] }}</span>
{% if customfield['type'] != 9 %}
<br />
{% endif %}
<span class="light">{{ customfield['description'] }}</span>
{% endif %}
</div>
</div>

0 comments on commit 95869cf

Please sign in to comment.
You can’t perform that action at this time.