edb/bbs
8
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gulp and bower++, could break stuff

Browse Source
This commit is contained in:
nikolark committed 2014-10-06 22:52:27 +02:00
1 parent 3727f1c14a
commit 8d30585cdb
504 files changed
+93722 -9819
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

templates/base.html
+51 -13
View File
@@ -6,15 +6,52 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="x-django-static-url" content="{{ STATIC_URL }}">
{% compress css %}
<link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/screen.css" type="text/css" media="screen, projection">
{% compress css inline %}
<link rel="stylesheet" href="{{ STATIC_URL }}dist/styles/screen.css" type="text/css" media="screen, projection">
{% endcompress %}
{%block headinc %}{%endblock%}
</head>
<body>
<header id="header">
{%block header%}
{% include "nav.html" %}
<nav class="navbar navbar-inverse" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Biceps Bar System - BBS</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="{% block active_register %}{% endblock %}"><a href="/register"><i class="glyphicon glyphicon-home white"></i> Kjøp drikke</a></li>
<li class="{% block active_deposit %}{% endblock %}"><a href="/deposit">Sett inn penger</a></li>
<li class="{% block active_log %}{% endblock %}"><a href="/log"><i class="glyphicon glyphicon-list-alt"></i> Logg</a></li>
<li class="{% block active_stats %}{% endblock %}"><a href="/stats"><i class="glyphicon glyphicon-stats"></i> Statistikk</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
{% if not user.is_authenticated %}
<li><a href="{% url 'login' %}">Logg inn</a></li>
{% else %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.get_profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="{% block active_create_user %}{% endblock %}"><a href="{% url 'create-user' %}"><i class="glyphicon glyphicon-plus"></i> Ny bruker</a></li>
{% if request.user.is_superuser %}<li><a href="/admin"><i class="glyphicon glyphicon-cog"></i> Administrasjon</a></li>{% endif %}
{% if request.user.is_superuser %}<li class="{% block active_inventory %}{% endblock %}"><a href="{% url 'inventory' %}"><i class="glyphicon glyphicon-briefcase"></i> Varebeholdning</a></li>{% endif %}
{% if request.user.is_superuser %}<li class="{% block active_report %}{% endblock %}"><a href="{% url 'report' %}"><i class="glyphicon glyphicon-briefcase"></i> Rapport</a></li>{% endif %}
<li class="divider"></li>
<li><a href="{% url 'logout' %}"><i class="glyphicon glyphicon-log-out"></i> Logg ut</a></li>
</ul>
</li>
{% endif %}
</ul>
</div><!-- /.navbar-collapse -->
</nav>
{%endblock%}
</header>
<div id="container" class="container">
@@ -25,23 +62,24 @@
{%block footer %}
<div class="credits">
Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://edb.neuf.no/">EDB-gjengen i KAK</a><br/>
<a href="http://edb.neuf.no/"><img src="{{ STATIC_URL }}img/edb_brick.png" alt="EDB" /></a>
<a href="http://edb.neuf.no/"><img src="{{ STATIC_URL }}dist/images/edb_brick.png" alt="EDB" /></a>
</div>
{%endblock%}
</div>
</div>
</div>
{% compress js %}
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/collapse.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/dropdown.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap/tooltip.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/locales/bootstrap-datepicker.nb.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/highcharts.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/underscore-min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/app.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/collapse.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/dropdown.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tooltip.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/bootstrap-datepicker/js/locales/bootstrap-datepicker.nb.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/highcharts/highcharts.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}app/bower_components/underscore/underscore-min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}dist/js/app.js"></script>
{% endcompress %}
{%block tailinc %}{%endblock%}
</body>
templates/deposit.html
+2 -8
View File
@@ -1,8 +1,6 @@
{% extends "base.html" %}
{% load widget_tweaks %}
{% block header %}
{% include "nav.html" with active="deposit" %}
{% endblock %}
{% block active_deposit %}active{% endblock %}
{% block content %}
<section id="deposit" class="row">
@@ -50,11 +48,7 @@
<ul class="well">
{% for user in users %}
<li class="customer">{% spaceless %}
{% if user.get_profile.image %}
  <img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture"/><br />
{% else %}
  <img class="profile" src="{{ STATIC_URL }}img/unknown_person.png" alt="Profile picture" /><br />
{% endif %}
<img class="profile" src="{{ user.get_profile.profile_image_url }}" alt="Profile picture"/><br />
<span class="name">{{ user.first_name }} {{ user.last_name|slice:":1"}}</span><br />
<span class="balance">{{ user.get_profile.balance }}</span>
<span class="id" style="display:none;">{{ user.id }}</span>
templates/home.html
-12
View File
@@ -1,12 +0,0 @@
{% extends "base.html" %}
{%block header%}
{% include "nav.html" with active="home" %}
{%endblock%}
{%block content%}
<div class="row">
<section class="col-xs-4">
<h1>Biceps Bar System</h1>
</section>
</div>
{%endblock%}
templates/inventory.html
+1 -3
View File
@@ -1,7 +1,5 @@
{% extends "base.html" %}
{% block header %}
{% include "nav.html" with active="inventory" %}
{% endblock %}
{% block active_inventory %}active{% endblock %}
{% block content %}
<section id="inventory" class="row">
templates/inventory_add.html
+1 -3
View File
@@ -4,9 +4,7 @@
{% block title %}Legg til nye varer {% endblock %}
{% block header %}
{% include "nav.html" with active="inventory_add" %}
{% endblock %}
{% block active_inventory_add" %}active{% endblock %}
{% block content %}
{% if perms.auth.can_add_inventory_transaction %}
templates/log.html
+1 -3
View File
@@ -1,7 +1,5 @@
{% extends "base.html" %}
{% block header %}
{% include "nav.html" with active="log" %}
{% endblock %}
{% block active_log %}active{% endblock %}
{% block content %}
<section id="log" class="row">
templates/nav.html
-38
View File
@@ -1,38 +0,0 @@
<nav class="navbar navbar-inverse" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Biceps Bar System - BBS</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="{% if active = "register" %}active{% endif %}"><a href="/register"><i class="glyphicon glyphicon-home white"></i> Kjøp drikke</a></li>
<li class="{% if active = "deposit" %}active{% endif %}"><a href="/deposit">Sett inn penger</a></li>
<li class="{% if active = "log" %}active{% endif %}"><a href="/log"><i class="glyphicon glyphicon-list-alt"></i> Logg</a></li>
<li class="{% if active = "stats" %}active{% endif %}"><a href="/stats"><i class="glyphicon glyphicon-stats"></i> Statistikk</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
{% if not user.is_authenticated %}
<li><a href="{% url 'login' %}">Logg inn</a></li>
{% else %}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="{{ user.get_profile.profile_image_url }}" /><span class="name">{{ user.first_name }}</span> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class="{% if active = "create_user" %}active{% endif %}"><a href="{% url 'create-user' %}"><i class="glyphicon glyphicon-plus"></i> Ny bruker</a></li>
{% if request.user.is_superuser %}<li><a href="/admin"><i class="glyphicon glyphicon-cog"></i> Administrasjon</a></li>{% endif %}
{% if request.user.is_superuser %}<li><a href="{% url 'inventory' %}"><i class="glyphicon glyphicon-briefcase"></i> Varebeholdning</a></li>{% endif %}
{% if request.user.is_superuser %}<li><a href="{% url 'report' %}"><i class="glyphicon glyphicon-briefcase"></i> Rapport</a></li>{% endif %}
<li class="divider"></li>
<li><a href="{% url 'logout' %}"><i class="glyphicon glyphicon-log-out"></i> Logg ut</a></li>
</ul>
</li>
{% endif %}
</ul>
</div><!-- /.navbar-collapse -->
</nav>
templates/register.html
+4 -10
View File
@@ -1,7 +1,5 @@
{% extends "base.html" %}
{% block header %}
{% include "nav.html" with active="register" %}
{% endblock %}
{% block active_register %}active{% endblock %}
{% block content %}
<section id="register" class="row">
@@ -42,16 +40,12 @@
<div class="col-md-12">
<ul class="well">
<li class="customer">{% spaceless %}
<img class="profile" src="{{ STATIC_URL }}img/unknown_person.png" alt="Profile picture" /><br />
<img class="profile" src="{{ STATIC_URL }}dist/images/unknown_person.png" alt="Profile picture" /><br />
<span class="name">Ekstern</span><br />
<span class="balance">&nbsp;</span>
{% endspaceless %}</li>
{% for user in users %}<li class="customer{% if user.get_profile.last_purchase_date < half_a_year_ago and not user.get_profile.last_purchase == None %} infrequent hidden{% endif %}">{% spaceless %}
{% if user.get_profile.image %}
  <img class="profile" src="{{ user.get_profile.image }}" alt="Profile picture" /><br />
{% else %}
  <img class="profile" src="{{ STATIC_URL }}img/unknown_person.png" alt="Profile picture" /><br />
{% endif %}
<img class="profile" src="{{ user.get_profile.profile_image_url }}" alt="Profile picture" /><br />
<span class="name">{{ user.first_name }} {{ user.last_name|slice:":1"}}</span><br />
<span class="balance">{{ user.get_profile.balance }}</span>
<span class="id" style="display:none;">{{ user.id }}</span>
@@ -85,7 +79,7 @@
{% if product.image %}
<img class="product" src="{{ product.image.url }}" /><br />
{% else %}
<img class="product" src="{{ STATIC_URL }}img/product.png" /><br />
<img class="product" src="{{ STATIC_URL }}dist/images/product.png" /><br />
{% endif %}
<span class="name">{{ product.name }}</span> - <span class="sale_price_ext">{{product.sale_price_ext|floatformat:0}}</span>/<span class="sale_price_int">{{product.sale_price_int|floatformat:0}}</span>
</li>
templates/registration/create_user.html
+1 -3
View File
@@ -3,9 +3,7 @@
{% block title %}Lag ny bruker {% endblock %}
{% block header %}
{% include "nav.html" with active="create_user" %}
{% endblock %}
{% block active_create_user" %}active{% endblock %}
{% block content %}
{% if perms.auth.can_add_user %}
templates/report.html
+1 -3
View File
@@ -1,8 +1,6 @@
{% extends "base.html" %}
{% load bootstrap %}
{% block header %}
{% include "nav.html" with active="inventory" %}
{% endblock %}
{% block active_report %}active{% endblock %}
{% block content %}
<section id="inventory-report" class="row">
templates/stats.html
+1 -3
View File
@@ -1,7 +1,5 @@
{% extends "base.html" %}
{% block header %}
{% include "nav.html" with active="stats" %}
{% endblock %}
{% block active_stats %}active{% endblock %}
{% block content %}
<section id="stats" class="row">