Removing all css classes and ids from html files

Removing all css but the converse.js ones

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