mirror/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-04-24 02:19:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove CSS, only chartJS remains

Browse Source
This commit is contained in:
James Cole
2026-03-14 06:40:23 +01:00
parent ac8dbbff6c
commit b8ebcdf1a8
15 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/v1/css/firefly.css
+4
View File
@@ -47,8 +47,12 @@
.empty-high-block {height:400px;}
.fw-normal {font-weight: normal;}
.position-relative {position: relative;}
.pointer {cursor:pointer;}
.big-line {line-height:1.7em;}
.bold-label {font-weight: normal;font-size:0.9em;}
/** tables **/
th.five {width:5%;}
th.ten {width:10%;}
th.fifteen td.fifteen {width:15%;}
td.twenty th.twenty {width:25%;}
public/v1/js/ff/piggy-banks/show.js
+4
View File
@@ -25,6 +25,10 @@ $(function () {
lineChart('chart/piggy-bank/' + piggyBankID, 'piggy-bank-history');
}
$('.confirm-history-delete').click(function() {
return confirm(confirmText);
});
// on submit of logout button:
$('.reset-link').click(function(e) {
console.log('here we are');
public/v1/js/ff/tags/index.js
+3
View File
@@ -22,4 +22,7 @@
$(function () {
"use strict";
$('.confirm-tag-delete').on('click', function() {
return confirm(confirmText);
});
});
resources/views/piggy-banks/show.twig
+2 -1
View File
@@ -114,7 +114,7 @@
</div>
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'event_history'|_ }} (<a onclick="return confirm('{{ 'reset_history_confirm'|_|escape('js') }}');" class="reset-link" href="#">{{ 'reset_history'|_ }}</a>)</h3>
<h3 class="box-title">{{ 'event_history'|_ }} (<a class="confirm-history-delete reset-link" href="#">{{ 'reset_history'|_ }}</a>)</h3>
</div>
<div class="box-body no-padding" id="piggyEvents">
{% include 'list/piggy-bank-events' %}
@@ -160,6 +160,7 @@
{% block scripts %}
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var piggyBankID = {{ piggyBank.id }};
var confirmText= '{{ 'reset_history_confirm'|_|escape('js') }}';
</script>
<script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>
resources/views/profile/delete-account.twig
+13 -1
View File
@@ -43,7 +43,7 @@
</div>
</div>
<div class="box-footer">
<button type="submit" onclick="return confirm('{{ 'are_you_sure'|_ }}');" class="btn btn-danger pull-right">
<button type="submit" class="btn btn-danger pull-right delete-profile">
{{ 'delete_account_button'|_ }}
</button>
</div>
@@ -53,3 +53,15 @@
</form>
{% endblock %}
{% block scripts %}
<!-- just a bit of inline code -->
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var confirmText= '{{ 'are_you_sure'|_|escape('js') }}';
$(function () {
"use strict";
$('.delete-profile').click(function () {
return confirm(confirmText);
});
});
</script>
{% endblock %}
resources/views/reports/partials/top-transactions.twig
+2 -2
View File
@@ -4,7 +4,7 @@
<th data-defaultsign="az">{{ 'account'|_ }}</th>
<th data-defaultsign="az">{{ 'description'|_ }}</th>
<th data-defaultsign="month">{{ 'date'|_ }}</th>
<th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'amount'|_ }}</th>
<th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ 'amount'|_ }}</th>
</tr>
</thead>
<tbody>
@@ -19,7 +19,7 @@
</td>
<!-- TODO i dont think transactionAmount will work. -->
<td class="text-right" data-value="{{ transaction.amount}}"><span
style="margin-right:5px;">
class="mr-2">
{{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
{% if null != transaction.foreign_amount %}
resources/views/rules/index.twig
+5 -5
View File
@@ -74,12 +74,12 @@
<table class="table table-hover table-striped group-rules">
<thead>
<tr>
<th style="width:5%;">&nbsp;</th>
<th class="five">&nbsp;</th>
<th class="ten">&nbsp;</th>
<th class="ten">&nbsp;</th>
<th class="quarter">{{ 'rule_name'|_ }}</th>
<th style="width:25%;" class="hidden-xs">{{ 'rule_triggers'|_ }}</th>
<th style="width:25%;" class="hidden-xs">{{ 'rule_actions'|_ }}</th>
<th class="quarter hidden-xs">{{ 'rule_triggers'|_ }}</th>
<th class="quarter hidden-xs">{{ 'rule_actions'|_ }}</th>
</tr>
</thead>
<tbody class="rule-connected-list">
@@ -152,7 +152,7 @@
{% endif %}
{% endfor %}
</ul>
<ul class="small rule-triggers-show" style="cursor:pointer;display:none;" data-id="{{ rule.id }}">
<ul class="small rule-triggers-show hidden pointer" data-id="{{ rule.id }}">
<li data-id="{{ rule.id }}">{{ 'show_triggers'|_ }}</li>
</ul>
{% endif %}
@@ -172,7 +172,7 @@
</li>
{% endfor %}
</ul>
<ul class="small rule-actions-show" style="cursor:pointer;display:none;" data-id="{{ rule.id }}">
<ul class="small rule-actions-show hidden pointer" data-id="{{ rule.id }}">
<li>{{ 'show_actions'|_ }}</li>
</ul>
resources/views/rules/partials/action.twig
+3 -3
View File
@@ -1,5 +1,5 @@
<tr data-count="{{ count }}" class="rule-action-holder">
<td style="width:40px;">
<td class="forty-px">
<a href="#" class="btn btn-danger btn-sm remove-action"><span class="fa fa-trash"></span></a>
</td>
<td class="thirty">
@@ -10,7 +10,7 @@
{% endfor %}
</select>
</td>
<td style="position: relative;">
<td class="position-relative">
<input autocomplete="off" type="text" value="{{ oldValue }}" name="actions[{{ count }}][value]"
class="form-control">
@@ -20,7 +20,7 @@
</p>
{% endif %}
</td>
<td style="width:20%;">
<td class="twenty">
<div class="checkbox">
<label>
<input type="checkbox" name="actions[{{ count }}][stop_processing]" value="1"
resources/views/rules/partials/trigger.twig
+3 -3
View File
@@ -1,5 +1,5 @@
<tr data-count="{{ count }}" class="rule-trigger-holder">
<td style="width:40px;">
<td class="forty-px">
<a href="#" class="btn btn-danger btn-sm remove-trigger"><span class="fa fa-trash"></span></a>
</td>
<td class="thirty">
@@ -13,7 +13,7 @@
{% endfor %}
</select>
</td>
<td style="width:40px;">
<td class="forty-px">
<div class="checkbox">
<label>
<input type="checkbox" name="triggers[{{ count }}][prohibited]" value="1"
@@ -31,7 +31,7 @@
</p>
{% endif %}
</td>
<td style="width:20%;">
<td class="twenty">
<div class="checkbox">
<label>
<input type="checkbox" class="trigger-stop-processing" name="triggers[{{ count }}][stop_processing]" value="1"
resources/views/search/index.twig
+3 -3
View File
@@ -91,10 +91,10 @@
<h3 class="box-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="box-body">
<p class="search_ongoing text-center" style="margin-top:70px;">
<p class="search_ongoing text-center">
{{ 'search_searching'|_ }}
</p>
<div class="search_results" class="hidden"></div>
<div class="search_results hidden"></div>
{# loading indicator #}
<div class="overlay">
<span class="fa fa-refresh fa-spin"></span>
@@ -123,7 +123,7 @@
</div>
</div>
</div>
<div class="row error_row" style="display:none; ">
<div class="row error_row hidden">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-danger">
<div class="box-header with-border">
resources/views/settings/notifications/index.twig
+1 -1
View File
@@ -23,7 +23,7 @@
</label>
</div>
{% endfor %}
<p style="margin-top:2em;">{{ 'channel_settings'|_ }}</p>
<p class="mt-5">{{ 'channel_settings'|_ }}</p>
{{ ExpandedForm.text('slack_webhook_url', slackUrl, {'label' : 'slack_url_label'|_, helpText: trans('firefly.slack_discord_double')}) }}
{{ ExpandedForm.text('pushover_app_token', pushoverAppToken, {}) }}
resources/views/settings/users/delete.twig
+14 -2
View File
@@ -25,8 +25,8 @@
</p>
</div>
<div class="box-footer">
<input type="submit" onclick="return confirm('{{ trans('firefly.are_you_sure')|escape('js') }}');" name="submit"
value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>
<input type="submit" name="submit"
value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right delete-user"/>
<a href="{{ URL.previous() }}" class="btn-default btn">{{ trans('form.cancel') }}</a>
</div>
@@ -36,3 +36,15 @@
</div>
</form>
{% endblock %}
{% block scripts %}
<!-- just a bit of inline code -->
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var confirmText= '{{ 'are_you_sure'|_|escape('js') }}';
$(function () {
"use strict";
$('.delete-user').click(function () {
return confirm(confirmText);
});
});
</script>
{% endblock %}
resources/views/tags/index.twig
+7 -6
View File
@@ -30,11 +30,9 @@
<div class="box-body">
<div class="row">
{% for tagInfo in entries %}
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2"
style="line-height: 1.7em;"
><input type="checkbox" name="tags[]" value="{{ tagInfo.id }}"> <a
class="label label-success"
style="font-weight: normal;font-size:0.9em;"
<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2 big-line">
<input type="checkbox" name="tags[]" value="{{ tagInfo.id }}"> <a
class="label label-success bold-label"
title="{{ tagInfo.created_at.isoFormat(monthAndDayFormat) }}"
href="{{ route('tags.show',tagInfo.id) }}">{% if tagInfo.location %}<span class="fa fa-fw fa-map-marker"></span>{% endif %}<span class="fa fa-fw fa-tag"></span>{{ tagInfo.tag }}{% if tagInfo.attachments.count() > 0 %}<span class="fa fa-fw fa-paperclip"></span>{% endif %}</a></div>
@@ -61,7 +59,7 @@
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
<a class="btn btn-success" href="{{ route('tags.create') }}"><span class="fa fa-plus fa-fw"></span> {{ ('no_tags_create_default')|_ }}</a>
<button type="submit" class="btn pull-right btn-danger" onclick="return confirm('{{ 'are_you_sure'|_|escape('js') }}');">
<button type="submit" class="btn pull-right btn-danger confirm-tag-delete">
<span class="fa fa-fw fa-trash"></span> {{ 'delete_all_selected_tags'|_ }}
</button>
</p>
@@ -72,5 +70,8 @@
{% endblock %}
{% block scripts %}
<script nonce="{{ JS_NONCE }}">
var confirmText = '{{ 'are_you_sure'|_|escape('js') }}';
</script>
<script src="v1/js/ff/tags/index.js?v={{ FF_BUILD_TIME }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}
resources/views/transactions/convert.twig
+1 -1
View File
@@ -61,7 +61,7 @@
<th class="quarter">Description</th>
<th class="quarter">Source account</th>
<th class="quarter">Destination account</th>
<th style="width:15%;">Amount</th>
<th class="fifteen">Amount</th>
</tr>
{% for transaction in groupArray.transactions %}
<tr>
resources/views/transactions/show.twig
+1 -1
View File
@@ -466,7 +466,7 @@
<table class="table">
{% for link in links[journal.transaction_journal_id] %}
<tr>
<td style="width:120px;">
<td class="onetwenty">
<div class="btn-group btn-group-xs">
<a href="#" class="btn btn-default switch-link" data-id="{{ link.id }}"><span
class="fa fa-fw fa-arrows-h"></span></a>