Merge branch 'master' of https://github.com/alct/nnmon

Conflicts:
	templates/index.html

media/css/style.css

@@ -619,7 +619,8 @@ div.comment {
 }
 
 .info-validate input[type=text],
-.info-validate input[type=submit] {
+.info-validate input[type=submit],
+.info-validate input[type=button] {
   width: 60%;
   padding: 3px;
   font-family: Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
@@ -632,13 +633,15 @@ div.comment {
   -o-border-radius: 2px;
   border-radius: 2px;
 }
-.info-validate input[type=submit] {
-  width: 21%;
+.info-validate input[type=submit],
+.info-validate input[type=button] {
+  width: 15%;
   padding-top: 2px;
   padding-bottom: 2px;
 }
 .button,
-.info-validate input[type=submit] {
+.info-validate input[type=submit],
+.info-validate input[type=button] {
   background-image: -webkit-gradient(
     linear,
     left bottom,
@@ -655,13 +658,16 @@ div.comment {
   border-bottom-color: #a0a0a0;
 }
 .button:hover,
-.info-validate input[type=submit]:hover {
+.info-validate input[type=submit]:hover,
+.info-validate input[type=button]:hover {
   border-color: #939393;
 }
 .button:active,
 .button:focus,
 .info-validate input[type=submit]:active,
-.info-validate input[type=submit]:focus {
+.info-validate input[type=submit]:focus,
+.info-validate input[type=button]:active,
+.info-validate input[type=button]:focus {
   background-image: -webkit-gradient(
     linear,
     left bottom,

templates/add.html

@@ -32,9 +32,11 @@ $(document).ready(function(){
   {% for field in form %}
       {% if field.label = 'Resource' %}<div id="show_optionals">{% trans "Provide optional details" %}</div><div id="optional">{%endif%}
       <div class="fieldWrapper">
+          <p>
           {{ field.errors }}
           <div class="help_text">{{ field.help_text }}</div>
           {{ field.label_tag }} {{ field }}
+          </p>
       </div>
   {% endfor %}
   </div>

templates/index.html

@@ -123,9 +123,9 @@ $(document).ready(function(){
   <table>
     <thead>
       <tr>
-        <th>{% trans "Infringing offering" %}</th>
+        <th style="width: 70%;">{% trans "Infringing offering" %}</th>
         <th>{% trans "Confirmed" %}</th>
-        <th>{% trans "I Confirm" %}</th>
+        <th></th>
       </tr>
     </thead>
   <tbody>
@@ -135,10 +135,10 @@ $(document).ready(function(){
           <div class="info-validate">
             <form method="get" id="{{ violation.pk }}" class="confirm_form" >
                 <label>{% trans "In order to <strong>validate your confirmation</strong> of this case, please enter your email address" %}</label>
-                <input type="text" name="email" />
+                <br/><input type="text" name="email" />
+                <input type="submit" value="{% trans "confirm" %}" />
+                <input type="button" value="{% trans "cancel" %}" class="cancel-button" />
                 <input type="hidden" value="{{ violation.pk }}" />
-                <input type="submit" value="{% trans "OK" %}" />
-                <input class="cancel-button button" type="button" value="{% trans "cancel" %}" />
               </form>
             </div>
        </td>