kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

(More or less) finish upgrading to Bootstrap 4

Browse Source
This commit is contained in:
Bernd Bestel
2018-07-10 20:37:13 +02:00
parent 306c404362
commit 71701804ea
54 changed files with 1297 additions and 1155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
views/components/batterycard.blade.php
View File

@@ -2,14 +2,13 @@
<script src="{{ $U('/viewjs/components/batterycard.js', true) }}?v={{ $version }}"></script>
@endpush
<div class="main well">
<h3>{{ $L('Battery overview') }} <strong><span id="batterycard-battery-name"></span></strong></h3>
<p>
<div class="card">
<div class="card-header">
<i class="fa fa-fw fa-battery-three-quarters"></i> {{ $L('Battery overview') }} <strong><span id="batterycard-battery-name"></span></strong>
</div>
<div class="card-body">
<strong>{{ $L('Used in') }}:</strong> <span id="batterycard-battery-used_in"></span><br>
<strong>{{ $L('Charge cycles count') }}:</strong> <span id="batterycard-battery-charge-cycles-count"></span><br>
<strong>{{ $L('Last charged') }}:</strong> <span id="batterycard-battery-last-charged"></span> <time id="batterycard-battery-last-charged-timeago" class="timeago timeago-contextual"></time><br>
</p>
</div>
</div>

6
views/components/datepicker.blade.php
View File

@@ -6,9 +6,9 @@
<label for="{{ $id }}">{{ $L($label) }}&nbsp;&nbsp;<span class="small text-muted"><time id="datepicker-timeago" class="timeago timeago-contextual"></time>@if(!empty($hint))<br>{{ $L($hint) }}@endif</span></label>
<div class="input-group date">
<input type="text" data-isodate="isodate" class="form-control datepicker" id="{{ $id }}" name="{{ $id }}" required autocomplete="off">
<div id="datepicker-button" class="input-group-addon">
<i class="fa fa-calendar"></i>
<div id="datepicker-button" class="input-group-append">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
<div class="help-block with-errors"></div>
<div class="invalid-feedback"></div>
</div>

14
views/components/datetimepicker.blade.php
View File

@@ -3,12 +3,12 @@
@endpush
<div class="form-group">
<label for="{{ $id }}">{{ $L($label) }}</label>
<div class="input-group date datetimepicker">
<input type="text" class="form-control" id="{{ $id }}" name="{{ $id }}" required>
<span class="input-group-addon">
<span class="fa fa-calendar"></span>
</span>
<label for="{{ $id }}">{{ $L($label) }}</label>
<div class="input-group date datetimepicker" id="{{ $id }}" data-target-input="nearest">
<input type="text" class="form-control datetimepicker-input" data-target="#{{ $id }}"/>
<div class="input-group-append" data-target="#{{ $id }}" data-toggle="datetimepicker">
<div class="input-group-text"><i class="fa fa-calendar"></i></div>
</div>
</div>
<div class="help-block with-errors"></div>
<div class="invalid-feedback"></div>
</div>

13
views/components/habitcard.blade.php
View File

@@ -2,13 +2,12 @@
<script src="{{ $U('/viewjs/components/habitcard.js', true) }}?v={{ $version }}"></script>
@endpush
<div class="main well">
<h3>{{ $L('Habit overview') }} <strong><span id="habitcard-habit-name"></span></strong></h3>
<p>
<div class="card">
<div class="card-header">
<i class="fa fa-fw fa-refresh"></i> {{ $L('Habit overview') }} <strong><span id="habitcard-habit-name"></span></strong>
</div>
<div class="card-body">
<strong>{{ $L('Tracked count') }}:</strong> <span id="habitcard-habit-tracked-count"></span><br>
<strong>{{ $L('Last tracked') }}:</strong> <span id="habitcard-habit-last-tracked"></span> <time id="habitcard-habit-last-tracked-timeago" class="timeago timeago-contextual"></time><br>
</p>
</div>
</div>

96
views/components/menu.blade.php
View File

@@ -1,96 +0,0 @@
<ul class="list-group list-group-flush sidebar-nav">
<a class="discrete-link" href="{{ $U('/stockoverview') }}">
<li class="list-group-item" data-nav-for-page="stockoverview">
<i class="fa fa-tachometer fa-fw"></i>&nbsp;{{ $L('Stock overview') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/habitsoverview') }}">
<li class="list-group-item" data-nav-for-page="habitsoverview">
<i class="fa fa-tachometer fa-fw"></i>&nbsp;{{ $L('Habits overview') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/batteriesoverview') }}">
<li class="list-group-item" data-nav-for-page="batteriesoverview">
<i class="fa fa-tachometer fa-fw"></i>&nbsp;{{ $L('Batteries overview') }}
</li>
</a>
</ul>
<div class="discrete-content-separator-2x"></div>
<ul class="list-group list-group-flush sidebar-nav">
<li class="list-group-item disabled"><a href="#"><strong>{{ $L('Record data') }}</strong></a></li>
<a class="discrete-link" href="{{ $U('/purchase') }}">
<li class="list-group-item" data-nav-for-page="purchase">
<i class="fa fa-shopping-cart fa-fw"></i>&nbsp;{{ $L('Purchase') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/consume') }}">
<li class="list-group-item" data-nav-for-page="consume">
<i class="fa fa-cutlery fa-fw"></i>&nbsp;{{ $L('Consume') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/shoppinglist') }}">
<li class="list-group-item" data-nav-for-page="shoppinglist">
<i class="fa fa-shopping-bag fa-fw"></i>&nbsp;{{ $L('Shopping list') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/inventory') }}">
<li class="list-group-item" data-nav-for-page="inventory">
<i class="fa fa-list fa-fw"></i>&nbsp;{{ $L('Inventory') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/habittracking') }}">
<li class="list-group-item" data-nav-for-page="habittracking">
<i class="fa fa-play fa-fw"></i>&nbsp;{{ $L('Habit tracking') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/batterytracking') }}">
<li class="list-group-item" data-nav-for-page="batterytracking">
<i class="fa fa-fire fa-fw"></i>&nbsp;{{ $L('Battery tracking') }}
</li>
</a>
</ul>
<div class="discrete-content-separator-2x"></div>
<ul class="list-group list-group-flush sidebar-nav">
<li class="list-group-item disabled"><a href="#"><strong>{{ $L('Manage master data') }}</strong></a></li>
<a class="discrete-link" href="{{ $U('/products') }}">
<li class="list-group-item" data-nav-for-page="products">
<i class="fa fa-product-hunt fa-fw"></i>&nbsp;{{ $L('Products') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/locations') }}">
<li class="list-group-item" data-nav-for-page="locations">
<i class="fa fa-map-marker fa-fw"></i>&nbsp;{{ $L('Locations') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/quantityunits') }}">
<li class="list-group-item" data-nav-for-page="quantityunits">
<i class="fa fa-balance-scale fa-fw"></i>&nbsp;{{ $L('Quantity units') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/habits') }}">
<li class="list-group-item" data-nav-for-page="habits">
<i class="fa fa-refresh fa-fw"></i>&nbsp;{{ $L('Habits') }}
</li>
</a>
<a class="discrete-link" href="{{ $U('/batteries') }}">
<li class="list-group-item" data-nav-for-page="batteries">
<i class="fa fa-battery-three-quarters fa-fw"></i>&nbsp;{{ $L('Batteries') }}
</li>
</a>
</ul>
<div class="discrete-content-separator-2x hidden-xs"></div>
<ul class="list-group list-group-flush nav-copyright">
<a class="discrete-link" href="#" data-toggle="modal" data-target="#about-modal">
<li class="list-group-item">
Version {{ $version }}<br>
{{ $L('About grocy') }}
</li>
</a>
</ul>

15
views/components/productcard.blade.php
View File

@@ -2,15 +2,14 @@
<script src="{{ $U('/viewjs/components/productcard.js', true) }}?v={{ $version }}"></script>
@endpush
<div class="main well">
<h3>{{ $L('Product overview') }} <strong><span id="productcard-product-name"></span></strong></h3>
<h4><strong>{{ $L('Stock quantity unit') }}:</strong> <span id="productcard-product-stock-qu-name"></span></h4>
<p>
<div class="card">
<div class="card-header">
<i class="fa fa-fw fa-product-hunt"></i> {{ $L('Product overview') }} <strong><span id="productcard-product-name"></span></strong>
</div>
<div class="card-body">
<strong>{{ $L('Stock quantity unit') }}:</strong> <span id="productcard-product-stock-qu-name"></span><br>
<strong>{{ $L('Stock amount') }}:</strong> <span id="productcard-product-stock-amount"></span> <span id="productcard-product-stock-qu-name2"></span><br>
<strong>{{ $L('Last purchased') }}:</strong> <span id="productcard-product-last-purchased"></span> <time id="productcard-product-last-purchased-timeago" class="timeago timeago-contextual"></time><br>
<strong>{{ $L('Last used') }}:</strong> <span id="productcard-product-last-used"></span> <time id="productcard-product-last-used-timeago" class="timeago timeago-contextual"></time>
</p>
</div>
</div>

17
views/components/usermenu.blade.php
View File

@@ -1,17 +0,0 @@
<ul class="nav navbar-nav ml-auto">
<li class="dropdown nav-item">
<a href="#" class="dropdown-toggle nav-link nav-link-navbar" data-toggle="dropdown">@if(AUTHENTICATED === true){{ HTTP_USER }}@endif <span class="caret"></span></a>
<ul class="dropdown-menu dropdown-menu-right">
<li class="dropdown-item">
<a class="discrete-link logout-button" href="{{ $U('/logout') }}"><i class="fa fa-sign-out fa-fw"></i>&nbsp;{{ $L('Logout') }}</a>
</li>
<div class="dropdown-divider"></div>
<li class="dropdown-item">
<a class="discrete-link" href="{{ $U('/manageapikeys') }}"><i class="fa fa-handshake-o fa-fw"></i>&nbsp;{{ $L('Manage API keys') }}</a>
</li>
<li class="dropdown-item">
<a class="discrete-link" target="_blank" href="{{ $U('/api') }}"><i class="fa fa-book"></i>&nbsp;{{ $L('REST API & data model documentation') }}</a>
</li>
</ul>
</li>
</ul>