这是indexloc提供的服务，不要输入任何密码
Skip to content

Minor style improvements, removal of unnecessary code #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 29, 2025
Merged

Minor style improvements, removal of unnecessary code #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
800c0e0
Styling resource_availability.tpl, tpl\Admin\Configuration\change_the…
labmecanicatec May 28, 2025
034cb97
The library list and Discord link have been updated.
labmecanicatec May 28, 2025
f8aa1ac
Removed commented code due to update to Bootstrap 5 and other librari…
labmecanicatec May 28, 2025
42bab3b
Styling tpl\Admin\Configuration\manage_email_templates.tpl, however t…
labmecanicatec May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ Thank you to the following projects and libraries
- jqplot
- FeedWriter
- Slim
- Bootstrap
- [Bootstrap](https://getbootstrap.com/)
- Select2
- Owl
- Font Awesome
- [Trumbowyg](https://alex-d.github.io/Trumbowyg/)
- [Bootstrap Icons](https://icons.getbootstrap.com/)
- Gregwar/captcha
- Monolog
7 changes: 1 addition & 6 deletions Web/scripts/admin/blackouts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function BlackoutManagement(opts) {
$(this).closest('.modal').modal("hide");
});

$('#result').on( 'click', '.reload', function (e) {
$('#result').on('click', '.reload', function (e) {
location.reload();
});

Expand Down Expand Up @@ -78,11 +78,6 @@ function BlackoutManagement(opts) {
$(this).closest('form').submit();
});

/*$('#cancelUpdate').click(function (e) {
$('#update-box').addClass('d-none');
$.unblockUI();
});*/

$('.blackoutResources').click(function (e) {
if ($(".blackoutResources input:checked").length == 0) {
e.preventDefault();
Expand Down
4 changes: 0 additions & 4 deletions Web/scripts/ajax-form-submit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@ jQuery.fn.bindAjaxSubmit = function (updateButton, successElement, modalDiv) {
function onBeforeAddSubmit(formData, jqForm, opts) {
successElement.addClass('d-none');

//$.blockUI({ message: $('#' + modalDiv.attr('id')) });
$('#waitModal').modal('show');
//modalDiv.show();

return true;
}

function hideModal() {
//modalDiv.hide();
$('#waitModal').modal('hide');
//$.unblockUI();

var top = self.scrollTop();
$('html, body').animate({ scrollTop: top }, 'slow');
Expand Down
36 changes: 0 additions & 36 deletions Web/scripts/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ function Dashboard(opts) {
var options = opts;

var ShowReservationAjaxResponse = function () {
//$('.blockUI').css('cursor', 'default');
$('#creatingNotification').hide();
$('#result').show();
};
Expand All @@ -11,39 +10,6 @@ function Dashboard(opts) {
$('#wait-box').modal('hide');
};
Dashboard.prototype.init = function () {
/*function setIcon(dash, targetIcon) {
var iconSpan = dash.find('.dashboardHeader').find('a>.bi');
iconSpan.removeClass('bi-chevron-up');
iconSpan.removeClass('bi-chevron-down');
iconSpan.addClass(targetIcon);
}

$(".dashboard").each(function (i, v) {
var dash = $(v);
var id = dash.attr('id');
var visibility = readCookie(id);
if (visibility == '0') {
dash.find('.dashboardContents').hide();
setIcon(dash, 'bi-chevron-down');
} else {
setIcon(dash, 'bi-chevron-up');
}

dash.find('.dashboardHeader a').click(function (e) {
e.preventDefault();
var dashboard = dash.find('.dashboardContents');
var id = dashboard.parent().attr('id');
if (dashboard.css('display') == 'none') {
createCookie(id, '1', 30, opts.scriptUrl);
dashboard.show();
setIcon(dash, 'bi-chevron-up');
} else {
createCookie(id, '0', 30, opts.scriptUrl);
dashboard.hide();
setIcon(dash, 'bi-chevron-down');
}
});
});*/

$('.resourceNameSelector').each(function () {
$(this).bindResourceDetails($(this).attr('resource-id'));
Expand Down Expand Up @@ -120,7 +86,6 @@ function Dashboard(opts) {
var refNum = $(this).attr('data-referencenumber');
$('#referenceNumber').val(refNum);
$('#wait-box').modal('show');
//$.blockUI({ message: $('#wait-box') });
ajaxPost(form, $(this).data('url'), null, function (data) {
$('button[data-referencenumber="' + refNum + '"]').addClass('d-none');
$('#result').html(data);
Expand All @@ -141,7 +106,6 @@ function Dashboard(opts) {
var form = $('#form-checkout');
var refNum = $(this).attr('data-referencenumber');
$('#referenceNumber').val(refNum);
//$.blockUI({ message: $('#wait-box') });
ajaxPost(form, null, null, function (data) {
$('button[data-referencenumber="' + refNum + '"]').addClass('d-none');
$('#result').html(data);
Expand Down
7 changes: 0 additions & 7 deletions Web/scripts/resourcePopup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$.fn.bindResourceDetails = function (resourceId, options) {
var opts = $.extend({ preventClick: false, position: 'left bottom' }, options);

/*var owl;*/

var showEvent = $(this).data('show-event');
if (!showEvent) {
Expand Down Expand Up @@ -88,12 +87,6 @@ $.fn.bindResourceDetails = function (resourceId, options) {
hideDiv();
});
tag.position({ my: 'left top', at: opts.position, of: resourceNameElement });
/*if (typeof '' !== "owlCarousel") {
owl = $(".owl-carousel");
owl.owlCarousel({
items: 1
});
}*/
}
}, 500);
}).mouseleave(function () {
Expand Down
1 change: 1 addition & 0 deletions lang/en_us.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@ protected function _LoadStrings()
$strings['AvailableGroups'] = 'Available Groups';
$strings['CheckingAvailabilityError'] = 'Cannot get resource availability - too many resources';
$strings['ScanToSchedule'] = 'Scan to schedule';
$strings['MaintenanceNotice'] = 'Currently performing maintenance. We will be back soon.';
// End Strings

// Install
Expand Down
7 changes: 5 additions & 2 deletions lang/es.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ protected function _LoadStrings()
$strings['ApplyToCurrentUsers'] = 'Aplicar a los usuarios actuales';
$strings['ReasonText'] = 'Razón';
$strings['NoAvailableMatchingTimes'] = 'No hay horas disponibles que coincidan con tu búsqueda';
$strings['Schedules'] = 'Horarios';
$strings['Schedules'] = 'Planificaciones';
$strings['NotifyUser'] = 'Notificar al usuario';
$strings['UpdateUsersOnImport'] = 'Actualizar el usuario existente si la dirección del correo electrónico ya existe.';
$strings['UpdateResourcesOnImport'] = 'Actualizar los recursos existentes si el nombre ya existe';
Expand Down Expand Up @@ -758,6 +758,7 @@ protected function _LoadStrings()
$strings['AvailableGroups'] = 'Grupos disponibles';
$strings['CheckingAvailabilityError'] = 'No es posible obtener la disponibilidad de recursos - demasiados recursos';
$strings['ScanToSchedule'] = 'Escanee para reservar';
$strings['MaintenanceNotice'] = 'Actualmente estamos en mantenimiento. Volveremos pronto.';
// End Strings

// Install
Expand Down Expand Up @@ -917,6 +918,8 @@ protected function _LoadStrings()
$strings['ViewCalendar'] = 'Ver Calendario';
$strings['DataCleanup'] = 'Limpiar Datos';
$strings['ManageEmailTemplates'] = 'Administrar Plantillas de Correo Electrónico';
$strings['CheckResources'] = 'Consultar Recursos';
$strings['CheckSchedules'] = 'Consultar Planificaciones';
// End Page Titles

// Day representations
Expand Down Expand Up @@ -1019,7 +1022,7 @@ protected function _LoadStrings()
//END NEEDS CHECKING

//View Resource
$strings['Check'] = 'Comprobar';
$strings['Check'] = 'Consultar';
$strings['PermissionType'] = 'Tipo de permiso';
$strings['NoResourcesToView'] = 'No hay recursos disponibles';
//End View Resource
Expand Down
9 changes: 2 additions & 7 deletions tpl/Admin/Blackouts/manage_blackouts.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@
</div>
<div class="accordion-footer border-top pt-3">
{filter_button class="btn-sm" id="filter"}
<button id="showAll"
class="btn btn-outline-secondary btn-sm"><i class="bi bi-list-task me-1"></i>{translate key=ViewAll}</button>
<button id="showAll" class="btn btn-outline-secondary btn-sm"><i
class="bi bi-list-task me-1"></i>{translate key=ViewAll}</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -369,12 +369,7 @@
var blackoutManagement = new BlackoutManagement(blackoutOpts);
blackoutManagement.init();

//$('#add-blackout-panel').showHidePanel();
});

//$.blockUI.defaults.css.width = '80%';
//$.blockUI.defaults.css.left = '10%';
//$.blockUI.defaults.css.marginTop = '-5%';
</script>

{control type="DatePickerSetupControl" ControlId="startDate" AltId="formattedStartDate"}
Expand Down
2 changes: 1 addition & 1 deletion tpl/Admin/Configuration/change_theme.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{include file='globalheader.tpl' }

<div id="page-change-theme" class="admin-page">
<div class="card default-box col-12 col-sm-8 mx-auto">
<div class="card shadow col-12 col-sm-8 mx-auto">
<div class="card-body">
<h1 class="border-bottom mb-3">{translate key=LookAndFeel}</h1>

Expand Down
66 changes: 20 additions & 46 deletions tpl/Admin/Configuration/manage_email_templates.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,29 @@

<div id="page-manage-email-templates" class="admin-page">

<div class="default-box col-xs-12 col-sm-8 col-sm-offset-2">
<h1>{translate key=ManageEmailTemplates}</h1>
<div class="card shadow col-12 col-sm-8 mx-auto">
<div class="card-body row">
<h1 class="border-bottom mb-3">{translate key=ManageEmailTemplates}</h1>

<div class="form-group col-sm-8 col-6 mb-3">
<select id="templateOpts" title="{translate key=EmailTemplate}" class="form-select">
<option value="">--- {translate key=SelectEmailTemplate} ---</option>
{foreach from=$Templates item=template}
<option value="{$template->FileName()}">{$template->Name()}</option>
{/foreach}
</select>

<div class="form-group col-sm-8 col-xs-6">
<select id="templateOpts" title="{translate key=EmailTemplate}" class="form-control">
<option value="">--- {translate key=SelectEmailTemplate} ---</option>
{foreach from=$Templates item=template}
<option value="{$template->FileName()}">{$template->Name()}</option>
{/foreach}
</select>

</div>

<div class="form-group col-sm-4 col-xs-6">
<select id="languageOpts" title="{translate key=Language}" class="form-control">
{foreach from=$Languages item=language}
<option value="{$language->LanguageCode}"
{if $Language==$language->LanguageCode}selected="selected"{/if}>{$language->DisplayName}</option>
{/foreach}
</select>
</div>

<div id="editEmailSection" class="no-show">
<div>
<form role="form" id="updateEmailForm" ajaxAction="{EmailTemplatesActions::Update}" method="post">
<div class="form-group col-xs-12">
<textarea id="templateContents" {formname key=EMAIL_CONTENTS} title="{translate key=EmailTemplate}"
class="form-control" rows="20" style="width:100%"></textarea>
</div>

<div class="form-group col-xs-12">
{indicator}
{update_button submit=true}
<input id="reloadEmailContents" type="button" class="btn btn-default"
value="{translate key=ReloadOriginalContents}"/>
</div>

<input type="hidden" id="templatePath" {formname key=EMAIL_TEMPLATE_NAME} />
{csrf_token}
</form>
</div>

<div id="updateSuccess" class="alert alert-success col-xs-12" style="display:none;">
<span class="glyphicon glyphicon-ok-sign"></span> {translate key=UpdateEmailTemplateSuccess}
<div class="form-group col-sm-4 col-6">
<select id="languageOpts" title="{translate key=Language}" class="form-select">
{foreach from=$Languages item=language}
<option value="{$language->LanguageCode}" {if $Language==$language->LanguageCode}selected="selected"
{/if}>{$language->DisplayName}</option>
{/foreach}
</select>
</div>

<div id="updateFailed" class="alert alert-warning col-xs-12" style="display:none;">
<span class="glyphicon glyphicon-alert"></span> {translate key=UpdateEmailTemplateFailed}
<div id="editEmailSection" class="d-none">
<div class="mb-2">
<form role="form" id="updateEmailForm" ajaxAction="{EmailTemplatesActions::Update}" method="post">
Expand All @@ -76,12 +51,11 @@
</div>

<div id="updateFailed" class="alert alert-warning d-none">
<i class="bi bi-exclamation-triangle-fill me-1"></i>{translate key=UpdateEmailTemplateFailed}
<i class="bi bi-exclamation-triangle-fill me-1"></i>{translate key=UpdateEmailTemplateFailure}
</div>
</div>
</div>

{include file="javascript-includes.tpl"}
{include file="javascript-includes.tpl"}

{jsfile src="ajax-helpers.js"}
{jsfile src="admin/email-templates.js"}
Expand Down
3 changes: 0 additions & 3 deletions tpl/Admin/Resources/manage_resources.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,17 +302,14 @@
<label
class="inline fw-bold">{translate key='Status'}</label>
{if $resource->IsAvailable()}
{*{html_image src="status.png"}*}
<a class="update changeStatus link-primary" href="#"
data-popover-content="#statusDialog">{translate key='Available'}</a>
<i class="bi bi-check-circle-fill text-success"></i>
{elseif $resource->IsUnavailable()}
{*{html_image src="status-away.png"}*}
<a class="update changeStatus link-primary" href="#"
data-popover-content="#statusDialog">{translate key='Unavailable'}</a>
<i class="bi bi-exclamation-circle-fill text-warning"></i>
{else}
{*{html_image src="status-busy.png"}*}
<a class="update changeStatus link-primary" href="#"
data-popover-content="#statusDialog">{translate key='Hidden'}</a>
<i class="bi bi-x-circle-fill text-danger"></i>
Expand Down
3 changes: 0 additions & 3 deletions tpl/Calendar/mycalendar.subscription.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<div id="calendarSubscription" class="calendar-subscription text-end">
{if $IsSubscriptionAllowed && $IsSubscriptionEnabled}
<a href="#" id="turnOffSubscription" class="link-primary d-none"><i class="bi bi-toggle-off"></i>
<!--{html_image src="switch-minus.png"}-->
{translate key=TurnOffSubscription}
</a>
{if $IsSubscriptionEnabled}
<a id="subscribeToCalendar" href="{$SubscriptionUrl}" class="link-primary"><i class="bi bi-calendar-heart"></i>
<!--{html_image src="calendar-share.png"}-->
{translate key=SubscribeToCalendar}
</a>
<br />
Expand All @@ -15,7 +13,6 @@
{/if}
{elseif $IsSubscriptionEnabled}
<a href="#" id="turnOnSubscription" class="link-primary"><i class="bi bi-toggle-on"></i>
<!--{html_image src="switch-plus.png"}-->
{translate key=TurnOnSubscription}
</a>
{/if}
Expand Down
8 changes: 4 additions & 4 deletions tpl/Dashboard/resource_availability.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
<div class="no-data text-center fst-italic fs-5">{translate key=None}</div>
{/if}

<div class="header fw-bold fs-5">{translate key=Unavailable}</div>
<div class="header fw-bold fs-5 mt-3">{translate key=Unavailable}</div>

{foreach from=$Schedules item=s}
{assign var=availability value=$Unavailable[$s->GetId()]}
{if is_array($availability) && $availability|default:array()|count > 0}
<h5>{$s->GetName()}</h5>
<div class="text-body-secondary fs-4 mt-3 text-center fw-bold">{$s->GetName()}</div>
{foreach from=$availability item=i}
<div class="availabilityItem row py-2 border-bottom align-items-center">
<div class="col-12 col-sm-5">
Expand Down Expand Up @@ -86,11 +86,11 @@
<div class="no-data text-center fst-italic fs-5">{translate key=None}</div>
{/if}

<div class="header fw-bold fs-5">{translate key=UnavailableAllDay}</div>
<div class="header fw-bold fs-5 mt-3">{translate key=UnavailableAllDay}</div>
{foreach from=$Schedules item=s}
{assign var=availability value=$UnavailableAllDay[$s->GetId()]}
{if is_array($availability) && $availability|default:array()|count > 0}
<h5>{$s->GetName()}</h5>
<div class="text-body-secondary fs-4 mt-3 text-center fw-bold">{$s->GetName()}</div>
{foreach from=$availability item=i}
<div class="availabilityItem row py-2 border-bottom align-items-center">
<div class="col-12 col-sm-5">
Expand Down
8 changes: 4 additions & 4 deletions tpl/Install/configure.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{/if}

{if $InstallPasswordMissing}
<div class="error alert alert-danger">
<div class="error alert alert-info">
<p>{translate key=SetInstallPassword}</p>
<p>{translate key=InstallPasswordInstructions args="$ConfigPath,$ConfigSetting,$SuggestedInstallPassword"}
</p>
Expand All @@ -23,8 +23,8 @@
<li>{translate key=ProvideInstallPassword}</li>
<li>{translate key=InstallPasswordLocation args="$ConfigPath,$ConfigSetting"}</li>
<li>{textbox type="password" name="INSTALL_PASSWORD" class="textbox" size="20"}
<button type="submit" name="" class="button" value="submit">{translate key=Next}<i
class="bi bi-arrow-right-circle-fill ms-1"></i></button>
<button type="submit" name="" class="btn btn-outline-secondary mt-2"
value="submit">{translate key=Next}<i class="bi bi-arrow-right-circle-fill ms-1"></i></button>
</li>
</ul>
{/if}
Expand All @@ -49,4 +49,4 @@
</div>
</div>
{include file="javascript-includes.tpl"}
{include file='globalfooter.tpl'}
{include file='globalfooter.tpl'}
Loading