A bunch of fixes

author: Filipp Lepalaan <f@230.to> 2013-11-27 13:35:55 +0200
committer: Filipp Lepalaan <f@230.to> 2013-11-27 13:35:55 +0200
commit: 1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d (patch)
tree: 715bb49e2521b2ed9ebbaf5585ef43c7848e41da /templates
parent: 8782fbe4766dc57e517eec622879d672d6d68378 (diff)
download: motor.old-1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d.tar.gz
motor.old-1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d.tar.bz2
motor.old-1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d.zip
13 files changed, 261 insertions, 38 deletions
diff --git a/templates/issues/customer.html b/templates/issues/customer.html
index a47ba32..ae5eff6 100644
--- a/templates/issues/customer.html
+++ b/templates/issues/customer.html
@@ -2,9 +2,17 @@
 {% load bootstrap3 %}
 {% load i18n %}
 
+{% block nav %}
+    <li><a href="#">{% trans "Product" %}</a></li>
+    <li><a href="#">{% trans "Issue" %}</a></li>
+    <li class="active"><a href="#">{% trans "Your info" %}</a></li>
+    <li><a href="#">{% trans "Done" %}</a></li>
+{% endblock nav %}
+
 {% block main %}
+    <h2>3. {% trans "Your info" %}</h2>
     <form method="post" action="">
-        {% csrf_token %}
+    {% csrf_token %}
     {% bootstrap_form form %}
     {% buttons %}
         <button type="submit" class="btn btn-primary">{% trans "Submit" %}</button>
diff --git a/templates/issues/details.html b/templates/issues/details.html
new file mode 100644
index 0000000..479eeeb
--- /dev/null
+++ b/templates/issues/details.html
@@ -0,0 +1,15 @@
+{% extends "issues/index.html" %}
+{% load bootstrap3 %}
+{% load i18n %}
+
+{% block main %}
+    <h2>2. {% trans "The Issue" %}</h2>
+    <p>Please describe the issue you're having with the product.</p>
+    <form method="post" action="{% url 'issues-details' %}" enctype="multipart/form-data">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <div class="form-group text-center">
+            <button type="submit" class="btn btn-primary">{% trans "Continue" %}</button>
+        </div>
+    </form>
+{% endblock main %}
diff --git a/templates/issues/device.html b/templates/issues/device.html
index def5b8b..66830d3 100644
--- a/templates/issues/device.html
+++ b/templates/issues/device.html
@@ -1,7 +1,43 @@
-{% extends "issues/index.html" %}
+{% extends "issues/warranty.html" %}
+{% load i18n %}
 
 {% block main %}
-    {% for k, v in models.items %}
-        <a href="{% url 'issues-choose_device' k %}">{{ v.name }}</a>
-    {% endfor %}
+<h2>{% trans "Choose Your Device" %}</h2>
+<p>Help text..</p>
+<div class="devices">
+    <div class="row">
+        <div class="col-md-3">
+            <a href="{% url 'issues-choose_device' 'mac' %}">
+                <img src="{{ STATIC_URL }}img/products/mac.png"/>
+                <div>{% trans "Mac" %}</div>
+            </a>
+        </div>
+        <div class="col-md-3">
+            <a href="{% url 'issues-choose_device' 'ipod' %}">
+                <img src="{{ STATIC_URL }}img/products/ipod.png"/>
+                <div>{% trans "iPod" %}</div>
+            </a>
+        </div>
+        <div class="col-md-3">
+            <a href="{% url 'issues-choose_device' 'iphone' %}">
+                <img src="{{ STATIC_URL }}img/products/iphone.png"/>
+                <div>{% trans "iPhone" %}</div>
+            </a>
+        </div>
+        <div class="col-md-3">
+            <a href="{% url 'issues-choose_device' 'ipad' %}">
+                <img src="{{ STATIC_URL }}img/products/ipad.png"/>
+                <div>{% trans "iPad" %}</div>
+            </a>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-3">
+            <a href="{% url 'issues-choose_device' 'other' %}">
+                <img src="{{ STATIC_URL }}img/products/other.png"/>
+                <div>{% trans "Other" %}</div>
+            </a>
+        </div>
+    </div>
+</div>
 {% endblock main %}
diff --git a/templates/issues/index.html b/templates/issues/index.html
index 70a84e7..eac766d 100644
--- a/templates/issues/index.html
+++ b/templates/issues/index.html
@@ -1,32 +1,51 @@
+{% load i18n %}
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
     <title>{{ title }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- Bootstrap -->
     <link href="{{ STATIC_URL }}bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="{{ STATIC_URL }}bootstrap/css/bootstrap-theme.min.css" rel="stylesheet" media="screen">
-    <link href="{{ STATIC_URL }}css/signin.css" rel="stylesheet" media="screen">
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
     <![endif]-->
+    <style type="text/css">
+        body {
+            padding-top: 20px;
+        }
+        .devices > div {
+            text-align: center;
+        }
+        .devices > div div {
+            padding: 10px;
+        }
+        label {
+            display: none;
+        }
+    </style>
   </head>
   <body>
-    <div class="container-fluid">
-      {% block main %}
-        <h2>{{ question.question }}</h2>
-        {% for i in question.choice_set.all %}
-          <a class="btn btn-default" href="{% url 'issues-index' i.pk %}">{{ i.choice }}</a>
-        {% endfor %}
-        <blockquote>{{ dump }}</blockquote>
-      {% endblock main %}
+    <div class="container">
+        <div class="navbar navbar-default" role="navbar">
+            <ul class="nav navbar-nav">
+            {% block nav %}
+                <li><a href="#">{% trans "Product" %}</a></li>
+                <li class="active"><a href="#">{% trans "Issue" %}</a></li>
+                <li><a href="#">{% trans "Your info" %}</a></li>
+                <li><a href="#">{% trans "Done" %}</a></li>
+            {% endblock nav %}
+            </ul>
+        </div>
+        {% block main %}
+        {% endblock main %}
     </div><!-- /container -->
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src="{{ STATIC_URL }}js/jquery.min.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="{{ STATIC_URL }}bootstrap/js/bootstrap.min.js"></script>
-  </body>
+    </body>
 </html>
diff --git a/templates/issues/ipad.html b/templates/issues/ipad.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/templates/issues/ipad.html
diff --git a/templates/issues/iphone.html b/templates/issues/iphone.html
new file mode 100644
index 0000000..3f5faf2
--- /dev/null
+++ b/templates/issues/iphone.html
@@ -0,0 +1 @@
+{% extends "issues/device.html" %}
diff --git a/templates/issues/ipod.html b/templates/issues/ipod.html
new file mode 100644
index 0000000..0c34c5b
--- /dev/null
+++ b/templates/issues/ipod.html
@@ -0,0 +1,20 @@
+{% extends "issues/device.html" %}
+{% load i18n %}
+
+{% block main %}
+    <h2>{% trans "iPod" %}</h2>
+    <div class="row">
+        <div class="col-md-3">
+            <a href="{% url 'issues-choose_device' 'mac' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/ipodtouch.png"/>
+                <div>{% trans "iPod touch" %}</div>
+            </a>
+        </div>
+        <div class="col-md-3">
+            <a href="{% url 'issues-choose_device' 'mac' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/ipodtouch.png"/>
+                <div>{% trans "iPod touch" %}</div>
+            </a>
+        </div>
+    </div>    
+{% endblock main %}
diff --git a/templates/issues/mac.html b/templates/issues/mac.html
new file mode 100644
index 0000000..97bd6f9
--- /dev/null
+++ b/templates/issues/mac.html
@@ -0,0 +1,49 @@
+{% extends "issues/device.html" %}
+{% load i18n %}
+
+{% block main %}
+<h2>{% trans "Mac" %}</h2>
+<p>{% trans "Choose your Mac" %}</p>
+<div class="devices">
+    <div class="row">
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'mac' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/macbook.png"/>
+                <div>{% trans "MacBook" %}</div>
+            </a>
+        </div>
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'ipod' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/macbookpro.png"/>
+                <div>{% trans "MacBook Pro" %}</div>
+            </a>
+        </div>
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'iphone' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/macbookair.png"/>
+                <div>{% trans "MacBook Air" %}</div>
+            </a>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'ipad' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/imac.png"/>
+                <div>{% trans "iMac" %}</div>
+            </a>
+        </div>
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'ipad' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/macpro.jpg"/>
+                <div>{% trans "Mac Pro" %}</div>
+            </a>
+        </div>
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'ipad' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/macmini.png"/>
+                <div>{% trans "Mac mini" %}</div>
+            </a>
+        </div>
+    </div>
+</div>    
+{% endblock main %}
diff --git a/templates/issues/other.html b/templates/issues/other.html
new file mode 100644
index 0000000..2d4d0ee
--- /dev/null
+++ b/templates/issues/other.html
@@ -0,0 +1,29 @@
+{% extends "issues/device.html" %}
+{% load i18n %}
+
+{% block main %}
+<h2>{% trans "Other" %}</h2>
+<p>{% trans "Choose your product" %}</p>
+<div class="devices">
+    <div class="row">
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'mac' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/wifi.png"/>
+                <div>{% trans "AirPort Express" %}</div>
+            </a>
+        </div>
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'mac' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/wifi.png"/>
+                <div>{% trans "AirPort Express" %}</div>
+            </a>
+        </div>
+        <div class="col-md-4">
+            <a href="{% url 'issues-details' 'mac' %}">
+                <img class="img-responsive" src="{{ STATIC_URL }}img/products/wifi.png"/>
+                <div>{% trans "AirPort Time Capsule" %}</div>
+            </a>
+        </div>
+    </div>
+</div>
+{% endblock main %}
diff --git a/templates/issues/question.html b/templates/issues/question.html
new file mode 100644
index 0000000..8da6e10
--- /dev/null
+++ b/templates/issues/question.html
@@ -0,0 +1,12 @@
+{% extends "issues/index.html" %}
+{% load i18n %}
+
+{% block main %}
+<div style="text-align:center">
+    <h1>{{ question.question }}</h1>
+    <p>{{ question.description|default:"" }}</p>
+    {% for i in question.choice_set.all %}
+        <a class="btn btn-default" href="{% url 'issues-index' i.pk %}">{{ i.choice }}</a>
+    {% endfor %}
+</div>
+{% endblock main %}
diff --git a/templates/issues/thanks.html b/templates/issues/thanks.html
index e69de29..0803d57 100644
--- a/templates/issues/thanks.html
+++ b/templates/issues/thanks.html
@@ -0,0 +1,18 @@
+{% extends "issues/index.html" %}
+{% load i18n %}
+
+{% block nav %}
+    <li><a href="#">{% trans "Product" %}</a></li>
+    <li><a href="#">{% trans "Issue" %}</a></li>
+    <li><a href="#">{% trans "Your info" %}</a></li>
+    <li class="active"><a href="#">{% trans "Done" %}</a></li>
+{% endblock nav %}
+
+{% block main %}
+<div style="text-align:center">
+    <h1>{% trans "Thanks!" %}</h1>
+    <img src="{{ STATIC_URL }}img/products/done.png" alt=""/><br/>
+    <p>Put description here...</p>
+    <a class="btn btn-primary" href="{% url 'issues-welcome' %}"><i class="glyphicon glyphicon-repeat"></i> {% trans "Restart" %}</a>
+</div>
+{% endblock main %}
diff --git a/templates/issues/warranty.html b/templates/issues/warranty.html
index b944ea5..2e0be24 100644
--- a/templates/issues/warranty.html
+++ b/templates/issues/warranty.html
@@ -1,28 +1,37 @@
 {% extends "issues/index.html" %}
 {% load i18n %}
 
+{% block nav %}
+    <li class="active"><a href="#">{% trans "Product" %}</a></li>
+    <li><a href="#">{% trans "Issue" %}</a></li>
+    <li><a href="#">{% trans "Your info" %}</a></li>
+    <li><a href="#">{% trans "Done" %}</a></li>
+{% endblock nav %}
+
 {% block main %}
     <div class="row">
         <div class="col-md-5">
             <img src="http://service.info.apple.com/parts/service_parts/products/imac_27_mid2011.jpg" alt="iMac (27-inch, Mid 2011)" title="iMac (27-inch, Mid 2011)">
         </div>
         <div class="col-md-7">
-            <h3>iMac (27-inch, Mid 2011)</h3>
-            <dl class="dl-horizontal">
-                <dt>{% trans "Warranty" %}</dt>
-                <dd>Out Of Warranty (No Coverage)</dd>
-                <dt>{% trans "Purchased" %}</dt>
-                <dd>2.6.2011, Sweden</dd>
-                <dt>{% trans "Serial Number" %}</dt>
-                <dd>DGKFL06JDHJP</dd>
-                <dt>{% trans "Configuration" %}</dt>
-                <dd>IMAC 27"/2.7QC/2X2GB/1TB/6770M</dd>
-            </dl>
+            <div style="padding: 20px">
+                <h3>iMac (27-inch, Mid 2011)</h3>
+                <dl class="dl-horizontal">
+                    <dt>{% trans "Warranty" %}</dt>
+                    <dd>Out Of Warranty (No Coverage)</dd>
+                    <dt>{% trans "Purchased" %}</dt>
+                    <dd>2.6.2011, Sweden</dd>
+                    <dt>{% trans "Serial Number" %}</dt>
+                    <dd>DGKFL06JDHJP</dd>
+                    <dt>{% trans "Configuration" %}</dt>
+                    <dd>IMAC 27"/2.7QC/2X2GB/1TB/6770M</dd>
+                </dl>
+            </div>
         </div>
     </div>
     <div class="row">
-        <div class="col-md-12">
-            <a class="btn btn-default" href="{% url 'issues-index' 0 %}">{% trans "Continue" %}</a>
+        <div class="col-md-12 text-center">
+            <a class="btn btn-primary" href="{% url 'issues-details' %}">{% trans "Continue" %}</a>
         </div>
     </div>
 {% endblock main %}
diff --git a/templates/issues/welcome.html b/templates/issues/welcome.html
index 38c0dcd..daef11b 100644
--- a/templates/issues/welcome.html
+++ b/templates/issues/welcome.html
@@ -1,15 +1,22 @@
 {% extends "issues/index.html" %}
+{% load bootstrap3 %}
 {% load i18n %}
 
+{% block nav %}
+    <li class="active"><a href="#">{% trans "Product" %}</a></li>
+    <li><a href="#">{% trans "Issue" %}</a></li>
+    <li><a href="#">{% trans "Your info" %}</a></li>
+    <li><a href="#">{% trans "Done" %}</a></li>
+{% endblock nav %}
+
 {% block main %}
-    <form method="post" action="{% url 'issues-warranty' %}">
-        {% csrf_token %}
-        <div class="form-group">
-            <label for="exampleInputEmail1">Serial Number</label>
-            <input type="email" class="form-control" id="exampleInputEmail1" placeholder="{% trans "Serial Number" %}" value="DGKFL06JDHJP">
-      </div>
-      <div class="form-group">
+<h2>1. {% trans "Product" %}</h2>
+<p>Let's start by identifying your device. Please enter your <a href="http://support.apple.com/kb/HT1349" target="_blank">serial number</a> or click Skip.</p>
+<form method="post" action="{% url 'issues-warranty' %}">
+    {% csrf_token %}
+    {% bootstrap_form form %}
+    <div class="form-group">
         <a href="{% url 'issues-choose_device' %}" class="btn btn-default">{% trans "Skip" %}</a>
-      </div>
-    </form>
+    </div>
+</form>
 {% endblock main %}
author	Filipp Lepalaan <f@230.to>	2013-11-27 13:35:55 +0200
committer	Filipp Lepalaan <f@230.to>	2013-11-27 13:35:55 +0200
commit	1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d (patch)
tree	715bb49e2521b2ed9ebbaf5585ef43c7848e41da /templates
parent	8782fbe4766dc57e517eec622879d672d6d68378 (diff)
download	motor.old-1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d.tar.gz motor.old-1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d.tar.bz2 motor.old-1bbfb4a44d42aca151f60a614ebeffbd44ef6e4d.zip