kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Expand views in v2

Browse Source
This commit is contained in:
James Cole
2020-11-15 14:02:49 +01:00
parent eb616f36ea
commit 259fadc433
5 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/v2/auth/login.twig
View File

@@ -32,7 +32,7 @@
{# demo site info #}
{% if IS_DEMO_SITE %}
<div class="callout callout-success">
<h5><i class="fas fa-info"></i> Firefly III demonistration website</h5>
<h5><i class="fas fa-info"></i> Firefly III demonstration website</h5>
To log in, please use email address <code>{{ DEMO_USERNAME }}</code> and password <code>{{ DEMO_PASSWORD }}</code>
</div>
{% endif %}

56
resources/views/v2/auth/mfa.twig Normal file
View File

@@ -0,0 +1,56 @@
{% extends "./layout/auth" %}
{% block content %}
{# error when logging in with MFA #}
{% if session_has('error') %}
<div class="row">
<div class="alert alert-danger alert-dismissible">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h5><i class="icon fas fa-ban"></i> {{ 'flash_error'|_ }}</h5>
{{ session('error') }}
</div>
</div>
{% endif %}
{# default header #}
<div class="login-box">
<div class="login-logo">
<img src="v2/images/firefly-iii-logo.png" alt="Firefly III" width="40"/>
<a href="{{ route('index') }}"><b>Firefly</b>III</a>
</div>
<!-- /.login-logo -->
<div class="card">
<div class="card-body login-card-body">
<p class="login-box-msg">{{ trans('firefly.two_factor_welcome', {user: user.email}) }}</p>
<p class="login-box-msg">{{ 'two_factor_enter_code'|_ }}</p>
<form action="{{ route('two-factor.submit') }}" method="POST">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="input-group mb-3">
<input type="text" id="oneTimeInput" name="one_time_password" class="form-control" placeholder="{{ 'two_factor_code_here'|_ }}"/>
<div class="input-group-append">
<div class="input-group-text">
<span class="fas fa-lock"></span>
</div>
</div>
</div>
<div class="row">
<div class="col-6">
</div>
<!-- /.col -->
<div class="col-6">
<button type="submit" class="btn btn-primary btn-block">{{ 'authenticate'|_ }}</button>
</div>
<!-- /.col -->
</div>
</form>
</div>
</div>
</div>
<script type="text/javascript" nonce="{{ JS_NONCE }}">
document.getElementById("oneTimeInput").focus();
</script>
<!-- /.login-box -->
{% endblock %}

11
resources/views/v2/index.twig
View File

@@ -10,6 +10,17 @@
<!-- /.row (main row) -->
{% endblock %}
{% block control %}
<div>
<div class="p-3 control-sidebar-content">
<h5>{{ 'date_range'|_ }}</h5>
<hr class="mb-2">
<div id="calendar"></div>
<hr class="mb-2">
</div>
</div>
{% endblock %}
{% block styles %}
{% endblock %}

2
resources/views/v2/partials/layout/navbar.twig
View File

@@ -104,7 +104,7 @@
</li>
<!-- here be dragons -->
<li class="nav-item">
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button">
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button" title="{{ 'here_be_dragons'|_ }}">
<i class="fas fa-dragon"></i>
</a>
</li>

2
resources/views/v2/partials/layout/sidebar.twig
View File

@@ -22,7 +22,7 @@
<!-- Sidebar Menu -->
<nav class="mt-2">
<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
<ul class="nav nav-compact nav-child-indent nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
<!-- Add icons to the links using the .nav-icon class
with font-awesome or any other icon font library -->
<li class="nav-item">