Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #18 from Pear-Trading/finn/htmllayout

Browse source 
Changed viewed layout
This commit is contained in:
Finn 2017-07-25 13:40:36 +01:00 committed by GitHub
commit 74d69e708a
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/layouts/admin.html.ep
View file

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>LocalLoop Admin - <%= title %></title> <title>LocalLoop Admin - <%= title %></title>
@ -28,7 +28,7 @@
<a class="navbar-brand" href="<%= url_for '/admin/home' %>">LocalLoop Admin</a> <a class="navbar-brand" href="<%= url_for '/admin/home' %>">LocalLoop Admin</a>
<div class="collapse navbar-collapse" id="navbarNav"> <div class="collapse navbar-collapse" id="navbarNav">
<div class="navbar-nav ml-auto"> <div class="navbar-nav ml-auto">
<a class="nav-item nav-link" href="<%= url_for '/' %>">User Section</a> <a class="nav-item nav-link<%= title eq 'Feedback' ? ' active' : '' %>" href="<%= url_for '/admin/feedback' %>">Feedback</a>
<a class="nav-item nav-link<%= title eq 'Tokens' ? ' active' : '' %>" href="<%= url_for '/admin/tokens' %>">Tokens</a> <a class="nav-item nav-link<%= title eq 'Tokens' ? ' active' : '' %>" href="<%= url_for '/admin/tokens' %>">Tokens</a>
<a class="nav-item nav-link<%= title eq 'Users' ? ' active' : '' %>" href="<%= url_for '/admin/users' %>">Users</a> <a class="nav-item nav-link<%= title eq 'Users' ? ' active' : '' %>" href="<%= url_for '/admin/users' %>">Users</a>
<a class="nav-item nav-link<%= title eq 'Organisations' ? ' active' : '' %>" href="<%= url_for '/admin/organisations' %>">Organisations</a> <a class="nav-item nav-link<%= title eq 'Organisations' ? ' active' : '' %>" href="<%= url_for '/admin/organisations' %>">Organisations</a>
@ -40,5 +40,5 @@
<%= content %> <%= content %>
</div> </div>
%= content_for 'javascript'; %= content_for 'javascript';
</body> </body>
</html> </html>

9
templates/layouts/user.html.ep
View file

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>LocalLoop - <%= title %></title> <title>LocalLoop - <%= title %></title>
@ -28,9 +28,10 @@
<a class="navbar-brand" href="<%= url_for '/home' %>">LocalLoop</a> <a class="navbar-brand" href="<%= url_for '/home' %>">LocalLoop</a>
<div class="collapse navbar-collapse" id="navbarNav"> <div class="collapse navbar-collapse" id="navbarNav">
<div class="navbar-nav ml-auto"> <div class="navbar-nav ml-auto">
<a class="nav-item nav-link<%= title eq 'Receipts' ? ' active' : '' %>" href="#">Receipts</a> <!-- Commented out until the routing for existent pages used is made -->
<!-- <a class="nav-item nav-link<%= title eq 'Receipts' ? ' active' : '' %>" href="#">Receipts</a>
<a class="nav-item nav-link<%= title eq 'Settings' ? ' active' : '' %>" href="#">Settings</a> <a class="nav-item nav-link<%= title eq 'Settings' ? ' active' : '' %>" href="#">Settings</a>
<a class="nav-item nav-link" href="<%= url_for '/logout' %>">Logout</a> <a class="nav-item nav-link" href="<%= url_for '/logout' %>">Logout</a> -->
</div> </div>
</div> </div>
</nav> </nav>
@ -39,5 +40,5 @@
<%= content %> <%= content %>
</div> </div>
%= content_for 'javascript'; %= content_for 'javascript';
</body> </body>
</html> </html>

4
templates/root/index.html.ep
View file

@ -3,6 +3,6 @@
% content_for javascript => begin % content_for javascript => begin
%= javascript '/static/user/js/home.js'; %= javascript '/static/user/js/home.js';
% end % end
<div class="card"> <div>
<h3 class="card-header">User Home</h3> <h1>App currently in development, please come back later!</h1>
</div> </div>