Download as
Browse Code »

Commit 02ebc6e981c1b506829861571e92f55edfe3a4c2

Authored by Matheus Figueiredo
1 parent f552f1a7
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Removing all css classes and ids from html files 

Removing all css but the converse.js ones
Showing 9 changed files with 75 additions and 120 deletions   Show diff stats
src/colab/deprecated/templates/account_change_password.html
  Diff comments   View file @02ebc6e
... ... @@ -5,7 +5,7 @@
5 5 {% block main-content %}
6 6  
7 7 {% if form.errors %}
8   - <div class="alert">
  8 + <div>
9 9 <b>{% trans "Please correct the errors below and try again." %}</b>
10 10 </div>
11 11 {% endif %}
... ... @@ -13,7 +13,7 @@
13 13 <form method="POST" action=".">
14 14 {% csrf_token %}
15 15  
16   - <fieldset class="span-24 box">
  16 + <fieldset>
17 17 {% render_form_field form.old_password %}
18 18 {% render_form_field form.new_password1 %}
19 19 {% render_form_field form.new_password2 %}
... ...
src/colab/deprecated/templates/account_message.html
  Diff comments   View file @02ebc6e
... ... @@ -3,8 +3,8 @@
3 3  
4 4 {% block main-content %}
5 5  
6   -<span class="span-24 {{ msg_css_class }}">
  6 +<span>
7 7 {% trans msg %}
8 8 </span>
9 9  
10   -{% endblock %}
11 10 \ No newline at end of file
  11 +{% endblock %}
... ...
src/colab/deprecated/templates/account_request_reset_password.html
  Diff comments   View file @02ebc6e
... ... @@ -7,7 +7,7 @@
7 7 <form method="POST" action="{% url 'request_reset_password' %}">
8 8 {% csrf_token %}
9 9  
10   - <fieldset class="span-24 center box">
  10 + <fieldset>
11 11 <label>{% trans "User" %}:</label>
12 12 <input name="username"/>
13 13 <input type="submit" value="{% trans 'Send new password' %}"/>
... ...
src/colab/deprecated/templates/base.html
  Diff comments   View file @02ebc6e
... ... @@ -3,54 +3,10 @@
3 3 <head>
4 4  
5 5 <!-- Framework CSS -->
6   - <link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/screen.css"
7   - type="text/css" media="screen, projection" />
8   -
9   - <link rel="stylesheet" href="{{ STATIC_URL }}css/blueprint/print.css"
10   - type="text/css" media="print" />
11   -
12   - <!--[if IE]><link rel="stylesheet"
13   - href="{{ STATIC_URL }}css/blueprint/ie.css"
14   - type="text/css" media="screen, projection" /><![endif]-->
15   -
16   - <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
17   - type="text/css" media="screen" charset="utf-8"/>
18   -
19   - <link rel="stylesheet" href="{{ STATIC_URL }}third-party/converse.js/converse.css"
20   - type="text/css" media="screen, projection" />
21   -
22   - <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.7.min.js"></script>
23   - <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
24   -
25   - <script data-main="{{ STATIC_URL }}third-party/converse.js/main" src="{{ STATIC_URL }}third-party/converse.js/Libraries/require-jquery.js"></script>
26 6  
27 7 {% block head_js %}
28 8 {% endblock %}
29 9 {% block head_css %}
30   - <!-- css used to show the selected item on filters -->
31   - <style type="text/css">
32   - .selected {
33   - font-weight: bold;
34   - }
35   -
36   - .selected a {
37   - text-decoration: none;
38   - color: #000;
39   - background-image: url('{{ STATIC_URL }}img/x.png');
40   - background-repeat: no-repeat;
41   - background-position: 0 3px;
42   - padding-left: 16px;
43   - }
44   -
45   - .selected a:hover {
46   - text-decoration: underline;
47   - }
48   -
49   - li.selected:before {
50   - content: '';
51   - }
52   - </style>
53   -
54 10 {% endblock %}
55 11  
56 12 {% block google_analytics %}
... ... @@ -71,21 +27,21 @@
71 27  
72 28 </head>
73 29  
74   - <body class="container">
75   - <div id="header" class="span-24">
76   - <div id="top-menu" class="right">
  30 + <body>
  31 + <div>
  32 + <div>
77 33 {% if not user.is_authenticated %}
78   - <span class="colborder">
  34 + <span>
79 35 <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>
80 36 </span>
81 37 <span>
82 38 <a href="{% url 'login' %}?next={{ request.path }}">{% trans "Login" %}</a>
83 39 </span>
84 40 {% else %}
85   - <span class="colborder">
  41 + <span>
86 42 {% trans "authenticated as" %} <b>{{ user.username }}</b>
87 43 </span>
88   - <span class="colborder">
  44 + <span>
89 45 <a href="{% url 'user_profile' user.username %}">
90 46 {% trans "My Profile" %}
91 47 </a>
... ... @@ -99,25 +55,25 @@
99 55 </div>
100 56  
101 57 {% block header %}
102   - <h1><span class="hide">{% trans "COLAB" %}</span>
  58 + <h1><span>{% trans "COLAB" %}</span>
103 59 <a href="/">
104 60 <img src="{{ STATIC_URL }}img/logo_small.png" alt="{% trans 'Colab' %}" /></a>
105 61 </h1>
106 62 {% endblock %}
107 63  
108   - <div id="header-menu" class="span-24">
  64 + <div>
109 65  
110   - <span class="colborder">
  66 + <span>
111 67 <a href="{% url 'thread_list' %}">{% trans "Discussions" %}</a>
112 68 </span>
113   - <span class="colborder">
  69 + <span>
114 70 <a href="http://colab.interlegis.gov.br/wiki" target="_blank">{% trans "Wiki" %}</a>
115 71 </span>
116   - <span class="colborder">
  72 + <span>
117 73 <a href="http://listas.interlegis.gov.br/mailman/listinfo/"
118 74 target="_blank">{% trans "Contribute" %}</a>
119 75 </span>
120   - <span class="colborder">
  76 + <span>
121 77 <a href="http://colab.interlegis.leg.br/newticket"
122 78 target="_blank">{% trans "Report a problem" %}</a>
123 79 </span>
... ... @@ -125,7 +81,7 @@
125 81 <a href="{% url "feedzilla_index" %}">{% trans "Planet" %}</a>
126 82 </span>
127 83  
128   - <span class="right">
  84 + <span>
129 85 <form action="/search/" method="GET">
130 86 <input name="q" id="header-searchbox" value="{{ request.GET.q }}"
131 87 type="text" placeholder="{% trans 'Search here...' %}" />
... ... @@ -137,13 +93,13 @@
137 93  
138 94 <hr/>
139 95  
140   - <div id="main-content" class="span-24">
  96 + <div>
141 97 {% block main-content %} {% endblock %}
142 98 </div>
143 99  
144 100 <hr/>
145 101  
146   - <div id="footer" class="span-24 center">
  102 + <div>
147 103 {% block footer %}
148 104 <p><a href="{% url 'opendata' %}"><img src="{{ STATIC_URL }}img/opendata3.png"/></a></p>
149 105 <p>{% trans "The contents of this site is published under license" %} <a
... ...
src/colab/deprecated/templates/login.html
  Diff comments   View file @02ebc6e
... ... @@ -4,16 +4,16 @@
4 4  
5 5 {% block main-content %}
6 6 {% if form.errors %}
7   - <div class="error">
  7 + <div>
8 8 {{ form.non_field_errors }}
9 9 </div>
10 10 {% endif %}
11 11  
12   - <div id="login-form-wrapper">
13   - <form class="span-24" method="POST" action="{% url 'login' %}">
  12 + <div>
  13 + <form method="POST" action="{% url 'login' %}">
14 14 {% csrf_token %}
15 15  
16   - <fieldset class="span-10 box">
  16 + <fieldset>
17 17 <legend>{% trans "Login" %}</legend>
18 18 <p>
19 19 {{ form.username.label_tag }}
... ... @@ -27,21 +27,20 @@
27 27 </p>
28 28  
29 29 <input type="submit" value="Login" />
30   - <a class="right" href="{% url 'request_reset_password' %}">{% trans "I forgot my password" %}</a>
  30 + <a href="{% url 'request_reset_password' %}">{% trans "I forgot my password" %}</a>
31 31  
32 32 <input type="hidden" name="next" value="{% firstof next '/' %}" />
33 33 </fieldset>
34 34  
35   - <fieldset class="span-12 box last">
  35 + <fieldset>
36 36 <legend>{% trans "Not already registered? Sign up!" %}</legend>
37   - <p class="prepend-1 span-10 justify large">
  37 + <p>
38 38 {% blocktrans %}To access some features of Colab you must be registered.
39 39 If you are not already registered systems in the community Interlegis
40 40 click on the link below and get to work!
41 41 {% endblocktrans %}</p>
42 42  
43   - <a class="span-11 center large"
44   - href="{% url 'signup' %}">{% trans "Sign up" %}</a>
  43 + <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>
45 44 </fieldset>
46 45 </form>
47 46 </div>
... ...
src/colab/deprecated/templates/open-data.html
  Diff comments   View file @02ebc6e
... ... @@ -2,7 +2,7 @@
2 2 {% load i18n %}
3 3  
4 4 {% block main-content %}
5   - <div class="span-18">
  5 + <div>
6 6 <h2>{% trans "OpenData - Communities Interlegis" %}</h2>
7 7 <p>{% blocktrans %}At this point the system Colab provides much of its data
8 8 through its search engine.{% endblocktrans %}</p>
... ... @@ -16,7 +16,7 @@
16 16 <a href="/api/search/">http://colab.interlegis.leg.br/api/search/</a></p>
17 17  
18 18 <h3>{% trans "Parameters:" %}</h3>
19   - <ul class="prepend-1">
  19 + <ul>
20 20 <li>
21 21 <h4><i>{% trans "Query" %}</i> - q</h4>
22 22 {% blocktrans %}The <i>query</i> is the "question" sent
... ... @@ -25,7 +25,7 @@
25 25 for example <b>collaborator</b> and represents the data stored
26 26 by the system, for example <b>jeanferri</b>.{% endblocktrans %}
27 27 {% trans "The following is a list of available fields to search:" %}<br/>
28   - <ul class="prepend-1">
  28 + <ul>
29 29 <li><b>Type</b>: {% trans "wiki, thread, ticket, changeset." %}</li>
30 30 <li><b>Title</b>: {% trans "page name, title of the discussion or ticket, changeset description." %}</li>
31 31 <li><b>Description</b>: {% trans "excerpt from the page or the discussion, description of the ticket or changeset." %}</li>
... ...
src/colab/deprecated/templates/search.html
  Diff comments   View file @02ebc6e
... ... @@ -2,39 +2,39 @@
2 2 {% load i18n %}
3 3 {% load append_to_get %}
4 4 {% block main-content %}
5   - <h2 class="span-6">{% trans "Search" %}</h2>
6   - <span class="right quiet">
  5 + <h2>{% trans "Search" %}</h2>
  6 + <span>
7 7 {{ docs.numFound }} {% trans "documents found in" %}
8 8 {{ docs.QTime|floatformat:3 }} {% trans "seconds" %}
9 9 </span>
10 10  
11 11 <hr/>
12 12  
13   - <div class="span-5 border filters">
  13 + <div>
14 14 <h3>{% trans "Filters" %}</h3>
15 15  
16 16 <h4>{% trans "Types" %}</h4>
17 17  
18   - <ul class="legend">
19   - <li {% ifequal type "wiki" %} class="selected" title="{% trans "Remove filter" %}" {% endifequal %}>
  18 + <ul>
  19 + <li {% ifequal type "wiki" %} title="{% trans "Remove filter" %}" {% endifequal %}>
20 20 <span>
21 21 <img src="{{ STATIC_URL }}img/wiki.png">
22 22 </span>
23 23 <a href="{% ifnotequal type "wiki" %} {% append_to_get type='wiki' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Wiki" %}</a>
24 24 </li>
25   - <li {% ifequal type "thread" %} class="selected" title="{% trans "Remove filter" %}" {% endifequal %}>
  25 + <li {% ifequal type "thread" %} title="{% trans "Remove filter" %}" {% endifequal %}>
26 26 <span>
27 27 <img src="{{ STATIC_URL }}img/thread.png">
28 28 </span>
29 29 <a href="{% ifnotequal type "thread" %} {% append_to_get type='thread' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Discussion" %}</a>
30 30 </li>
31   - <li {% ifequal type "ticket" %} class="selected" title="{% trans "Remove filter" %}" {% endifequal %}>
  31 + <li {% ifequal type "ticket" %} title="{% trans "Remove filter" %}" {% endifequal %}>
32 32 <span>
33 33 <img src="{{ STATIC_URL }}img/ticket.png">
34 34 </span>
35 35 <a href="{% ifnotequal type "ticket" %} {% append_to_get type='ticket' %} {% else %} {% append_to_get type="" %} {% endifnotequal %}">{% trans "Ticket" %}</a>
36 36 </li>
37   - <li {% ifequal type "changeset" %} class="selected" title="{% trans "Remove filter" %}" {% endifequal %}>
  37 + <li {% ifequal type "changeset" %} title="{% trans "Remove filter" %}" {% endifequal %}>
38 38 <span>
39 39 <img src="{{ STATIC_URL }}img/changeset.png">
40 40 </span>
... ... @@ -43,21 +43,21 @@
43 43 </ul>
44 44 </div>
45 45  
46   - <div class="span-17 prepend-1 last">
  46 + <div>
47 47 <ul>
48 48 {% for doc in docs %}
49 49 {% include "message-preview.html" %}
50 50 {% empty %}
51   - <li class="center">
  51 + <li>
52 52 {% trans "No results for your search." %}
53 53 </li>
54 54 {% endfor %}
55 55 </ul>
56 56  
57   - <hr class="space"/>
  57 + <hr />
58 58  
59 59 {% if docs.numFound %}
60   - <div class="pagination center">
  60 + <div>
61 61 <span>
62 62 {% if docs.has_previous %}
63 63 <a href="{% append_to_get p=docs.previous_page_number %}">{% trans "Previous" %}</a>
... ...
src/colab/deprecated/templates/signup-form.html
  Diff comments   View file @02ebc6e
... ... @@ -6,13 +6,13 @@
6 6 <h2>{% trans "Sign up" %}</h2>
7 7  
8 8 {% if form.errors %}
9   -<div class="alert"><b>{% trans "Please correct the errors below and try again." %}</b></div>
  9 +<div><b>{% trans "Please correct the errors below and try again." %}</b></div>
10 10 {% endif %}
11 11  
12   -<div class="avatar-placeholder box">
13   - <label class="avatar-placeholder">{% trans "Avatar" %}</label >
14   - <div class="avatar-image avatar">
15   - <img src="{{ STATIC_URL }}img/user.png" alt="user"/>
  12 +<div>
  13 + <label>{% trans "Avatar" %}</label >
  14 + <div>
  15 + <img src="{{ STATIC_URL }}img/user.png" alt="user"/>
16 16 </div>
17 17 <p>
18 18 {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>.
... ... @@ -20,34 +20,34 @@
20 20 </div>
21 21  
22 22  
23   -<p class="required span-24 last">
  23 +<p>
24 24 <label>{% trans "Required fields" %}</label>
25 25 </p>
26 26  
27   -<form class="span-24" id="signup" action="." method="post">
  27 +<form id="signup" action="." method="post">
28 28 {% csrf_token %}
29 29  
30   - <fieldset class="box span-11">
  30 + <fieldset>
31 31 <legend>{% trans "Access Information" %}</legend>
32 32 {% render_form_field form.username %}
33 33 {% render_form_field form.password1 %}
34 34 {% render_form_field form.password2 %}
35 35 </fieldset>
36 36  
37   - <fieldset class="box last">
  37 + <fieldset>
38 38 <legend>{% trans "Professionals Information" %}</legend>
39 39 {% render_form_field form.institution %}
40 40 {% render_form_field form.role %}
41 41 </fieldset>
42 42  
43   - <fieldset class="box span-11">
  43 + <fieldset>
44 44 <legend>{% trans "Personal Information" %}</legend>
45 45 {% render_form_field form.first_name %}
46 46 {% render_form_field form.last_name %}
47 47 {% render_form_field form.email %}
48 48 </fieldset>
49 49  
50   - <fieldset class="box last">
  50 + <fieldset>
51 51 <legend>{% trans "Others" %}</legend>
52 52 {% render_form_field form.twitter %}
53 53 {% render_form_field form.facebook %}
... ... @@ -55,13 +55,13 @@
55 55 {% render_form_field form.webpage %}
56 56 </fieldset>
57 57  
58   - <fieldset class="box span-11">
  58 + <fieldset>
59 59 <legend>{% trans "Subscribe to mail lists" %}</legend>
60 60 {% render_form_field form.lists %}
61 61 </fieldset>
62 62  
63   - <div class="span-24">
64   - <input class="right" type="submit" value="{% trans 'Register' %}"/>
  63 + <div>
  64 + <input type="submit" value="{% trans 'Register' %}"/>
65 65 </div>
66 66 </form>
67 67 {% endblock %}
... ...
src/colab/deprecated/templates/user-profile.html
  Diff comments   View file @02ebc6e
... ... @@ -8,7 +8,7 @@
8 8  
9 9 {% block main-content %}
10 10 {% if not user_profile %}
11   - <span class="notice span-24">
  11 + <span>
12 12 <b>{% trans "User not registered." %}</b> {% trans "Is that you?" %}
13 13 <a href="{% url 'signup' %}">{% trans "Click here and sign up." %}</a>
14 14 </span>
... ... @@ -16,7 +16,7 @@
16 16 {% else %}
17 17  
18 18 {% ifequal request.user.username user_profile.user.username %}
19   - <span class="success span-24">
  19 + <span>
20 20 {% trans "Hey, look at you! Do you want to " %}
21 21 <a href="{% url 'user_profile_update' request.user %}">{% trans "update your profile" %}</a>?
22 22 </span>
... ... @@ -24,21 +24,21 @@
24 24  
25 25 {% endif %}
26 26  
27   - <div id="user-profile">
  27 + <div>
28 28 <h2>{{ email_address.get_full_name }}</h2>
29 29  
30   - <div class="span-4">
  30 + <div>
31 31 <img class="avatar" width="120px" heigth="120px"
32 32 src="http://www.gravatar.com/avatar/{{ email_address.md5 }}?s=120&d=identicon" />
33 33 </div>
34 34  
35   - <div class="span-20 last">
36   - <div class="span-10">
  35 + <div>
  36 + <div>
37 37 <form action="{% url 'user_profile_update' request.user %}" method='post'>
38 38 {% csrf_token %}
39 39  
40 40 <h3>{% trans "Personal Information" %}</h3>
41   - <ul id="user-info">
  41 + <ul>
42 42 <li>
43 43 {{ form.username.label_tag }}: {{ user_profile.user.username }}
44 44 {% ifequal request.user.username user_profile.user.username %}
... ... @@ -53,7 +53,7 @@
53 53 </li>
54 54 </ul>
55 55  
56   - <hr class="space" />
  56 + <hr />
57 57  
58 58 <h3>{% trans "Other informations" %}</h3>
59 59 <ul>
... ... @@ -71,28 +71,28 @@
71 71 </li>
72 72 </ul>
73 73  
74   - <hr class="space"/>
  74 + <hr />
75 75 {% if editable %}
76   - <span class="span-5">
77   - <input class="right" type="submit" value="{% trans 'Save' %}"/>
  76 + <span>
  77 + <input type="submit" value="{% trans 'Save' %}"/>
78 78 </span>
79 79 {% endif %}
80 80 </form>
81 81 </div>
82 82  
83 83 {% if type_count %}
84   - <div class="span-10 last">
85   - <h3 class="center">{% trans "Collaborations by Area" %}</h3>
86   - <div id="collabs"></div>
  84 + <div>
  85 + <h3>{% trans "Collaborations by Area" %}</h3>
  86 + <div></div>
87 87 </div>
88 88 {% endif %}
89 89 </div>
90 90  
91   - <hr class="space" />
  91 + <hr />
92 92  
93   - <div class="span-13">
  93 + <div>
94 94 <h3>{% trans "Latest posted" %} </h3>
95   - <ul class="colborder">
  95 + <ul>
96 96 {% for doc in emails %}
97 97 {% include "message-preview.html" %}
98 98 {% empty %}
... ... @@ -101,7 +101,7 @@
101 101 </ul>
102 102 </div>
103 103  
104   - <div class="span-11 last">
  104 + <div>
105 105 <h3>{% trans "Community inside participations" %}</h3>
106 106 <ul>
107 107 {% for doc in docs %}
... ...