Mercurial > kraina_muminkow

changeset 25:3a26da290650

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Michał Rudowicz <michal.rudowicz@fl9.eu>
date Mon, 09 May 2011 10:49:01 +0200
parents 3a2876457625 (current diff) 9916d46ff096 (diff)
children f73176cba39b
files frontend/mfrontend/db.py
diffstat 3 files changed, 88 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/frontend/mfrontend/db.py	Mon May 09 10:46:38 2011 +0200
+++ b/frontend/mfrontend/db.py	Mon May 09 10:49:01 2011 +0200
@@ -135,9 +135,12 @@
         sqlLine = "select * from jobs where " + sqlLine + ";"
     result = query_db(sqlLine,parameters)
     # teraz trochę upiększamy wynik, np. pobierając nazwy użytkowników
+    index = 0
     for job in result:
+	job['index'] = index
         job['username'] = get_user_name(job['owner_id'])
         job['state_text'] = states[job['state']]
+	index = index + 1
     return result
 
 def get_waiting_job():
--- a/frontend/mfrontend/templates/joblist.html	Mon May 09 10:46:38 2011 +0200
+++ b/frontend/mfrontend/templates/joblist.html	Mon May 09 10:49:01 2011 +0200
@@ -1,19 +1,24 @@
 {% extends "layout.html" %}
 {% block body %}
-<h2>Lista zadań</h2>
-<table border="1">
+
+<div class="frame">
+<div class="ft"><div class="ftl"></div><div class="ftc">Lista zadań</div><div class="ftr"></div></div>
+<div class="fm">
+
+<table class="inner" width="100%">
     <tr>
-            <th>id</th>
-            <th>Właściciel</th>
-            <th>Hash</th>
-            <th>Opis</th>
-            <th>Metoda</th>
-            <th>Stan</th>
-            <th>Postęp</th>
-            <th>Wynik</th>
+            <th class="colhead">id</th>
+            <th class="colhead">Właściciel</th>
+            <th class="colhead">Hash</th>
+            <th class="colhead">Opis</th>
+            <th class="colhead">Metoda</th>
+            <th class="colhead">Stan</th>
+            <th class="colhead">Postęp</th>
+	    <th class="colhead">Wynik</th>
+
     </tr>
     {% for job in jobs %}
-    <tr>
+    <tr class="row{{ job.index % 2 + 2}}">
         <td>{{ job.id }}</td>
         <td>{{ job.username }}</td>
         <td>{{ job.hash }}</td>
@@ -30,4 +35,10 @@
     </tr>
     {% endfor %}
 </table>
+</div>
+<div class="fb"><div class="fbl"></div><div class="fbc"></div><div class="fbr"></div></div>
+</div>
+&nbsp;
+</div>
 {% endblock %} 
+
--- a/frontend/mfrontend/templates/layout.html	Mon May 09 10:46:38 2011 +0200
+++ b/frontend/mfrontend/templates/layout.html	Mon May 09 10:49:01 2011 +0200
@@ -1,20 +1,72 @@
- <!doctype html>
+<html>
+<head>
 <title>NASZA APLIKACJA!</title>
-<div class=page>
-    <h1>NO HEJ</h1>
-  <div class=metanav>
+<script type="text/javascript" src="http://mild.net.pl/aiir/jquery.js"></script>
+<script type="text/javascript" src="http://mild.net.pl/aiir/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<link rel="stylesheet" href="http://mild.net.pl/aiir/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" type="text/css" href="http://mild.net.pl/aiir/style.css">
+</head><body>
+<div id="content">
+<div style="display:none">
+	<div id="add">
+  {% if error %}<p class=error><strong>Błąd:</strong> {{ error }}{% endif %}
+  <form action="/jobs/add/" method=post>
+    <dl>
+      <dt>Opis zadania:
+      <dd><input type=text name=label>
+      <dt>Hash:
+      <dd><input type=text name=hash>
+      <dt>Metoda łamania hasha:
+      <dd><input type=radio name=method value=0>Metoda 0
+      <dd><input type=radio name=method value=1>Metoda 1
+      <dd><input type=submit value=Dodaj>
+    </dl>
+  </form>
+</div>
+</div>
+<div style="display:none">
+	<div id="login">
+  <form action="{{ url_for('frontend.login') }}" method=post>
+    <dl>
+      <dt>Nazwa użytkownika:
+      <dd><input type=text name=username>
+      <dt>Hasło:
+      <dd><input type=password name=password>
+      <dd><input type=submit value=Login>
+    </dl>
+  </form>
+</div>
+</div>
+<div style="display:none">
+	<div id="register">
+  <form action="{{ url_for('frontend.register') }}" method=post>
+    <dl>
+      <dt>Nazwa użytkownika:
+      <dd><input type=text name=username>
+      <dt>Hasło:
+      <dd><input type=password name=password>
+      <dd><input type=submit value=Rejestruj>
+    </dl>
+  </form>
+</div>
+</div>
+    <h1>Krakersik</h1>
+  <div id="menu">
   {% if not session.logged_in %}
-  <a href="{{ url_for('frontend.login') }}">Zaloguj się</a> | 
-  <a href="{{ url_for('frontend.register') }}">Załóż konto</a>
+  <div class="button"><a id="loginlink" href="#login">Zaloguj się</a></div>
+  <div class="button"><a id="registerlink" href="#register">Załóż konto</a></div>
   {% else %}
-  <a href="{{ url_for('frontend.index') }}">Strona główna</a> | 
-  <a href="{{ url_for('jobcontrol.index') }}">Lista zadań</a> | 
-  <a href="{{ url_for('jobcontrol.add') }}">Dodaj zadanie</a> | 
-  <a href="{{ url_for('frontend.logout') }}">Wyloguj się</a>
+  <div class="button"><a href="{{ url_for('frontend.index') }}">Strona główna</a></div>
+  <div class="button"><a href="{{ url_for('jobcontrol.index') }}">Lista zadań</a></div>
+  <div class="button"><a id="addlink" href="#add">Dodaj zadanie</a></div>
+  <div class="button"><a href="{{ url_for('frontend.logout') }}">Wyloguj się</a></div>
   {% endif %}
   </div>
   {% for message in get_flashed_messages() %}
     <div class=flash>{{ message }}</div>
   {% endfor %}
-  {% block body %}{% endblock %}
+  {% block body %}
+{% endblock %}
+<script type="text/javascript" src="http://mild.net.pl/aiir/general.js"></script>
 </div>
+</body></head>