reorganize the static folder structure

2024-09-03 19:26:15 +02:00 · 2011-11-27 23:28:24 +01:00 · 2011-11-27 23:28:24 +01:00 · 8570e79170
commit 8570e79170
parent 44060f03df
30 changed files with 26 additions and 19 deletions
--- a/budget/static/css/bootstrap.min.css
+++ b/budget/static/css/bootstrap.min.css
--- a/budget/static/css/images/delete.png
+++ b/budget/static/css/images/delete.png
--- a/budget/static/css/images/deleter.png
+++ b/budget/static/css/images/deleter.png
--- a/budget/static/css/images/edit.png
+++ b/budget/static/css/images/edit.png
--- a/budget/static/css/images/gradient.png
+++ b/budget/static/css/images/gradient.png
--- a/budget/static/css/images/reactivate.png
+++ b/budget/static/css/images/reactivate.png
--- a/budget/static/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/budget/static/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
--- a/budget/static/jquery/images/ui-bg_flat_0_eeeeee_40x100.png
+++ b/budget/static/jquery/images/ui-bg_flat_0_eeeeee_40x100.png
--- a/budget/static/jquery/images/ui-bg_flat_55_ffffff_40x100.png
+++ b/budget/static/jquery/images/ui-bg_flat_55_ffffff_40x100.png
--- a/budget/static/jquery/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/budget/static/jquery/images/ui-bg_flat_75_ffffff_40x100.png
--- a/budget/static/jquery/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/budget/static/jquery/images/ui-bg_glass_65_ffffff_1x400.png
--- a/budget/static/jquery/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
+++ b/budget/static/jquery/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
--- a/budget/static/jquery/images/ui-bg_highlight-soft_25_0073ea_1x100.png
+++ b/budget/static/jquery/images/ui-bg_highlight-soft_25_0073ea_1x100.png
--- a/budget/static/jquery/images/ui-bg_highlight-soft_50_dddddd_1x100.png
+++ b/budget/static/jquery/images/ui-bg_highlight-soft_50_dddddd_1x100.png
--- a/budget/static/jquery/images/ui-icons_0073ea_256x240.png
+++ b/budget/static/jquery/images/ui-icons_0073ea_256x240.png
--- a/budget/static/jquery/images/ui-icons_454545_256x240.png
+++ b/budget/static/jquery/images/ui-icons_454545_256x240.png
--- a/budget/static/jquery/images/ui-icons_666666_256x240.png
+++ b/budget/static/jquery/images/ui-icons_666666_256x240.png
--- a/budget/static/jquery/images/ui-icons_ff0084_256x240.png
+++ b/budget/static/jquery/images/ui-icons_ff0084_256x240.png
--- a/budget/static/jquery/images/ui-icons_ffffff_256x240.png
+++ b/budget/static/jquery/images/ui-icons_ffffff_256x240.png
--- a/budget/static/jquery/jquery-ui.css
+++ b/budget/static/jquery/jquery-ui.css
--- a/budget/static/css/main.css
+++ b/budget/static/css/main.css
@ -1,6 +1,6 @@
@import "bootstrap.min.css";
@import url(http://fonts.googleapis.com/css?family=Lobster|Comfortaa);
-@import "jquery/jquery-ui.css";
+@import "jquery-ui.css";

 html, body{
    margin-top: 25px;
@ -48,7 +48,7 @@ div.topbar ul.secondary-nav { padding-right: 75px; }
    font-family: 'Comfortaa', arial, serif;
    height: 165px;
    padding-top: 15px;
-    background-image: url("gradient.png");
+    background-image: url("images/gradient.png");
    background-position: center top;
    background-repeat: no-repeat;
 }
@ -135,9 +135,22 @@ div.topbar ul.secondary-nav { padding-right: 75px; }
    text-align: center;
 }

-.edit img, .delete img{
+.bill-actions > .delete, .bill-actions > .edit {
+    font-size: 0px;
+    display: block;
+    width: 16px;
    height: 16px;
-    margin-right: 5px;
+    margin: 2px;
+    margin-left: 5px;
+    float: left;
+}
+
+.bill-actions > .delete{
+    background: url('images/delete.png') no-repeat right;
+}
+
+.bill-actions > .edit{
+    background: url('images/edit.png') no-repeat right;
 }

 .balance-value{
@ -174,12 +187,12 @@ tr.payer_line .balance-name{
 }

 .delete a, .delete a:hover {
-    background: url('deleter.png') left no-repeat;
+    background: url('images/deleter.png') left no-repeat;
    color: red;
 }

 .reactivate a, .reactivate a:hover {
-    background: url('reactivate.png') left no-repeat;
+    background: url('images/reactivate.png') left no-repeat;
    color: white;
 }

--- a/budget/static/jquery/i18n/jquery.ui.datepicker-fr.js
+++ b/budget/static/jquery/i18n/jquery.ui.datepicker-fr.js
--- a/budget/static/ihatemoney/custom.js
+++ b/budget/static/ihatemoney/custom.js
--- a/budget/static/jquery/js/jquery-1.6.2.min.js
+++ b/budget/static/jquery/js/jquery-1.6.2.min.js
--- a/budget/static/jquery/js/jquery-ui.js
+++ b/budget/static/jquery/js/jquery-ui.js
--- a/budget/templates/add_bill.html
+++ b/budget/templates/add_bill.html
@ -1,11 +1,10 @@
 {% extends "layout.html" %}

 {% block head %}
-    <script src="{{ url_for("static", filename="jquery/js/jquery-ui.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/jquery-ui.js") }}"></script>
    {% if g.lang != "en" %}
-    <script src="{{ url_for("static", filename="jquery/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
+    <script src="{{ url_for("static", filename="js/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
    {% endif %}
-    <script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
 {% endblock %}
 {% block js %}
    $('#cancel-form').click(function(){location.href={{ url_for(".list_bills") }};});
--- a/budget/templates/add_member.html
+++ b/budget/templates/add_member.html
@ -1,7 +1,4 @@
 {% extends "layout.html" %}
-{% block head %}
-	<script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
-{% endblock %}
 {% block js %}
    auto_hide_default_text('#name');
 {% endblock %}
--- a/budget/templates/layout.html
+++ b/budget/templates/layout.html
@ -4,8 +4,9 @@
 <head>
    <title>{{ _("Account manager") }}{% block title %}{% endblock %}</title>
    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <link rel=stylesheet type=text/css href="{{ url_for("static", filename='main.css') }}">
-    <script src="{{ url_for("static", filename="jquery/js/jquery-1.6.2.min.js") }}"></script>
+    <link rel=stylesheet type=text/css href="{{ url_for("static", filename='css/main.css') }}">
+    <script src="{{ url_for("static", filename="js/jquery-1.6.2.min.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/ihatemoney.js") }}"></script>
    {% block head %}{% endblock %}
    <script type="text/javascript" charset="utf-8">
        $(document).ready(function(){
--- a/budget/templates/layout.txt
+++ b/budget/templates/layout.txt
@ -1,2 +0,0 @@
-{% block content %}
-{% endblock %}
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@ -2,11 +2,10 @@

 {% block title %}- {{ g.project.name }}{% endblock %}
 {% block head %}
-    <script src="{{ url_for("static", filename="jquery/js/jquery-ui.js") }}"></script>
+    <script src="{{ url_for("static", filename="js/jquery-ui.js") }}"></script>
    {% if g.lang != "en" %}
-    <script src="{{ url_for("static", filename="jquery/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
+    <script src="{{ url_for("static", filename="js/i18n/jquery.ui.datepicker-%s.js" % g.lang ) }}"></script>
    {% endif %}
-    <script src="{{ url_for("static", filename="ihatemoney/custom.js") }}"></script>
 {% endblock %}
 {% block js %}