首页 发现 帮助
登录
radu
/
Django-Hackathon-Starter
关注 1
点赞 0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Resolving merge conflicts

David Leonard 10 年之前
父节点
034d3651d4 6e20ee7f85
当前提交
53e8b88917
共有 8 个文件被更改，包括 88 次插入 和 33 次删除
分列视图 显示文件统计
  1. 0 4
      hackathon_starter/hackathon/forms.py
  2. 26 0
      hackathon_starter/hackathon/static/css/form.css
  3. 1 1
      hackathon_starter/hackathon/templates/hackathon/base.html
  4. 6 2
      hackathon_starter/hackathon/templates/hackathon/index.html
  5. 21 9
      hackathon_starter/hackathon/templates/hackathon/login.html
  6. 31 17
      hackathon_starter/hackathon/templates/hackathon/register.html
  7. 1 0
      hackathon_starter/hackathon_starter/settings.py
  8. 2 0
      requirements.txt

+ 0 - 4
hackathon_starter/hackathon/forms.py
查看文件 

@@ -9,7 +9,3 @@ class UserForm(forms.ModelForm):
 
     class Meta:
 
         model = User
 
         fields = ('username', 'email', 'password')
 
-
 
-class UserProfileForm(forms.ModelForm):
 
-    class Meta:
 
-        model = UserProfile

+ 26 - 0
hackathon_starter/hackathon/static/css/form.css
查看文件 

@@ -0,0 +1,26 @@
 
+
 
+div.well{
 
+  height: 250px;
 
+} 
+
 
+.Absolute-Center {
 
+  margin: auto;
 
+  position: absolute;
 
+  top: 0; left: 0; bottom: 0; right: 0;
 
+}
 
+
 
+.Absolute-Center.is-Responsive {
 
+  width: 50%; 
+  height: 50%;
 
+  min-width: 200px;
 
+  max-width: 400px;
 
+  padding: 40px;
 
+}
 
+
 
+#logo-container{
 
+  margin: auto;
 
+  margin-bottom: 10px;
 
+  width:200px;
 
+  height:30px;
 
+  background-image:url('http://placehold.it/200x30/000000/ffffff/&text=Django+Hackathon+Starter');
 
+}

+ 1 - 1
hackathon_starter/hackathon/templates/hackathon/base.html
查看文件 

@@ -3,7 +3,7 @@
 
     <head>
 
       <title> Django Hackathon Starter </title>
 
       <script src="/static/bower_components/jquery/dist/jquery.js"></script>
 
-      <script type="text/javascript" src="/static/bower_components/bootstrap/dist/bootstrap.min.js"></script>
 
+      <script type="text/javascript" src="/static/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 
       
       
       <link rel="stylesheet" href="/static/bower_components/bootstrap/dist/css/bootstrap.min.css">

+ 6 - 2
hackathon_starter/hackathon/templates/hackathon/index.html
查看文件 

@@ -4,7 +4,11 @@
 
     {% include 'hackathon/base.html' %}
 
 
     <body>
 
-        <h1>Api Example</h1>
 
-        <strong>{{ boldmessage }}</strong><br />
 
+    	{% if user.is_authenticated %}
 
+        	<h1>Api Example</h1>
 
+        	<strong>{{ boldmessage }}</strong><br />
 
+        {% else %}
 
+        	<h1> Please register/login! </h1>
 
+        {% endif %}
 
     </body>
 
 </html>

+ 21 - 9
hackathon_starter/hackathon/templates/hackathon/login.html
查看文件 

@@ -3,17 +3,29 @@
 
     {% include 'hackathon/base.html' %}
 
 
     <body>
 
-        <h1>Login to Django Hackathon Starter</h1>
 
 
-        <form id="login_form" method="post" action="/hackathon/login/">
 
-            {% csrf_token %}
 
-            Username: <input type="text" name="username" value="" size="50" />
 
-            <br />
 
-            Password: <input type="password" name="password" value="" size="50" />
 
-            <br />
 
+        <div class='container text-center'>
 
+              <h2 class="form-signin-heading">Login</h2>
 
+              <br>
 
+              <form class="form-horizontal" id="login_form" method="post" action="/hackathon/login/">
 
+                {% csrf_token %}
 
+                {% load bootstrap %} 
 
-            <input type="submit" value="submit" />
 
-        </form>
 
+                <table>
 
+                  <tr>
 
+                     
+                      <td class="container text-center">Username: <input type="text" name="username" value="" size="50" /></td>
 
+                  </tr>
 
 
+                  <tr>
 
+                     
+                      <td class="container text-center">Password: <input type="password" name="password" value="" size="50" /></td>
 
+                  </tr>
 
+
 
+                </table>
 
+                <button class="btn btn-lg btn-primary" type="submit">Login</button>
 
+                <input type="hidden" name="submit" value="submit" />
 
+              </form>
 
+        </div>
 
     </body>
 
 </html>

+ 31 - 17
hackathon_starter/hackathon/templates/hackathon/register.html
查看文件 

@@ -1,28 +1,42 @@
 
 <!DOCTYPE html>
 
 <html>
 
     {% include 'hackathon/base.html' %}
 
+    <link rel="stylesheet" href="/static/css/form.css">
 
     <body>
 
-        <h1>Register with Django Hackathon Starter</h1>
 
-
 
         {% if registered %}
 
-        Django Hackathon says: <strong>thank you for registering!</strong>
 
-        <a href="/hackathon/">Return to the homepage.</a><br />
 
+          <strong>Thank you for registering!</strong>
 
+          <a href="/hackathon/">Return to the homepage.</a><br />
 
+        
         {% else %}
 
-        Django Hackathon says: <strong>register here!</strong><br />
 
-
 
-        <form id="user_form" method="post" action="/hackathon/register/"
 
+          <div class='container text-center'>
 
+              <h2 class="form-signin-heading">Sign Up</h2>
 
+              <br>
 
+              <form class="form-horizontal" id="user_form" method="post" action="/hackathon/register/"
 
                 enctype="multipart/form-data">
 
+                {% csrf_token %}
 
+                {% load bootstrap %} 
 
-            {% csrf_token %}
 
+                <table>
 
+                  <tr>
 
+                     
+                      <td class="container text-center">{{ user_form.username | bootstrap_horizontal}}</td>
 
+                  </tr>
 
 
-            <!-- Display each form. The as_p method wraps each element in a paragraph
 
-                 (<p>) element. This ensures each element appears on a new line,
 
-                 making everything look neater. -->
 
-            {{ user_form.as_p }}
 
+                  <tr>
 
+                     
+                      <td class="container text-center">{{ user_form.email | bootstrap_horizontal}}</td>
 
+                  </tr>
 
 
-            <!-- Provide a button to click to submit the form. -->
 
-            <input type="submit" name="submit" value="Register" />
 
-        </form>
 
-        {% endif %}
 
+                  <tr>
 
+                     
+                      <td class="container text-center">{{ user_form.password | bootstrap_horizontal}}</td>
 
+                  </tr>
 
+                </table>
 
+                <button class="btn btn-lg btn-primary" type="submit">Register</button>
 
+                <input type="hidden" name="submit" value="Register" />
 
+              </form>
 
+            </div>
 
+          {% endif %}
 
     </body>
 
-</html>
 
+</html>
 
+

+ 1 - 0
hackathon_starter/hackathon_starter/settings.py
查看文件 

@@ -37,6 +37,7 @@ INSTALLED_APPS = (
 
     'django.contrib.messages',
 
     'django.contrib.staticfiles',
 
     'hackathon',
 
+    'bootstrapform',
 
     'django_openid',
 
 )

+ 2 - 0
requirements.txt
查看文件 

@@ -1,4 +1,6 @@
 
 Django==1.7.6
 
+django-bootstrap-form==3.2
 
+django-bootstrap-forms==0.1
 
 django-bower==5.0.2
 
 requests==2.6.0
 
 six==1.9.0