Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:rollstudio/DjangoDash

  • Loading branch information...
commit 061c363e2687c28eab9266d09b27129e5e3a374e 2 parents cad1cd6 + 8a1c78f
Patrick Arminio authored August 18, 2012
BIN  assets/design/ipsedixit.png
39  assets/html/css/style.css
@@ -113,10 +113,19 @@ transition: color 0.4s ease-in;}
113 113
 #middle_column{width:25%; background:#FBFBFB;overflow:hidden;}
114 114
 #middle_column ul#wrapper{list-style-type:none; width:400%;height:100%; }
115 115
 #middle_column ul#wrapper li{width:25%;height:100%; }
  116
+#middle_column ul#wrapper h3{font-size:40px; margin-top:12px;line-height:40px;margin-bottom:20px;}
116 117
 #middle_column #about{float:left;position:relative;font-size:11px;}
117  
-#middle_column #about h3{font-size:40px; margin-top:12px;line-height:40px;margin-bottom:20px;}
118 118
 #middle_column #about .view {position:absolute; bottom: 80px;left:20px;}
119 119
 #middle_column #about .view a{text-decoration:none;color:#FF3399; font-weiht:bold; font-size:25px; letter-spacing:-2px;}
  120
+#middle_column .signin_list{width:100%;list-style-type:none;margin-top:20px;}
  121
+#middle_column .signin_list li{margin:0 0 4px 0;width:auto!important;}
  122
+#middle_column .signin_list li a{padding:0 1px; line-height:12px; border:1px solid #000; color:#000; text-decoration:none;font-weight:bold;}
  123
+#middle_column .signin_list li a:hover{border:1px solid #666; color:#666;}
  124
+
  125
+#middle_column .signup_list{width:100%;list-style-type:none;margin-top:20px;}
  126
+#middle_column .signup_list li{margin:0 0 4px 0;width:auto!important;}
  127
+#middle_column .signup_list li a{padding:0 1px; line-height:12px; border:1px solid #666; color:#666; text-decoration:none;font-weight:bold;}
  128
+#middle_column .signup_list li a:hover{border:1px solid #666; color:#666;}
120 129
 
121 130
 #right_column{width:25%; background:#F1F1F1;overflow:hidden;}
122 131
 #right_column ul#wrapper{height:100%;list-style-type:none; }
@@ -135,13 +144,39 @@ transition: color 0.4s ease-in;}
135 144
 #middle_column .prev_next a.next.disabled, #middle_column .prev_next a.next:hover{  background:url(../img/prev_next_middle.png) no-repeat 38px center;}
136 145
 /*#middle_column .prev_next a.next:hover{background:url(../img/prev_next_middle.png) no-repeat 38px top;}*/
137 146
 
  147
+#form_signin {margin-top: 40px;}
  148
+#form_signin p{margin:0 0 4px 0;font-size:12px;}
  149
+#form_signin legend{font-size: 30px;margin-top: 12px;line-height: 40px;margin-bottom: 20px;}
  150
+#form_signin fieldset{border:none;}
  151
+#form_signin label{display:block; float:left; text-align:right; width:40%;font-weight:bold; margin-right:10px;}
  152
+#form_signin .checkbox_signin{background:none; border:1px solid #000;width:15px; height:15px;}
  153
+#form_signin .forgot_signin{margin-top:-20px;}
  154
+#form_signin .forgot_signin a{color:#666;text-decoration:none;font-weight:bold;}
  155
+.submit_form{float:right; border:1px solid #000;padding:0px 16px 0 1px;background:url(../img/submit.png) no-repeat right center;font-family:Helvetica,"Arial Black",Arial,Gadget,sans-serif;text-transform:uppercase;font-size:14px;font-weight:bold;}
  156
+#form_register {margin-top: 40px;}
  157
+#form_register p{margin:0 0 4px 0;font-size:12px;}
  158
+#form_register legend{font-size: 30px;margin-top: 12px;line-height: 40px;margin-bottom: 20px;}
  159
+#form_register fieldset{border:none;}
  160
+#form_register label{display:block; float:left; text-align:right; width:40%;font-weight:bold; margin-right:10px;}
  161
+.input_signin{background:none; border:1px solid #000;width:50%;font-family:Helvetica,"Arial Black",Arial,Gadget,sans-serif;text-transform:uppercase;font-size:10px;font-weight:bold;}
  162
+
  163
+#form_your_id {margin-top: 40px;}
  164
+#form_your_id ul{width:100%;list-style-type:none;}
  165
+#form_your_id p{margin:0 0 10px 0;font-size:12px;position:relative;}
  166
+#form_your_id legend{font-size: 30px;margin-top: 12px;line-height: 40px;margin-bottom: 20px;}
  167
+#form_your_id fieldset{border:none;}
  168
+#form_your_id label{display:block; float:left; text-align:right; width:40%;font-weight:bold; margin-right:10px;}
  169
+#form_your_id .errorlist{position:absolute;left:0; top:11px;font-size:10px; color:#666;text-align:right; width:40%;font-weight:bold; margin-right:10px;}
  170
+#form_your_id .helptext{font-weight:bold;}
  171
+#form_your_id .submit_form{margin-right:41px;}
  172
+
138 173
 #right_column .prev_next a.prev{ background:url(../img/prev_next_right.png) no-repeat 44px 3px}
139 174
 #right_column .prev_next a.prev.disabled, #right_column .prev_next a.prev:hover{ background:url(../img/prev_next_right.png) no-repeat -16px 3px;}
140 175
 #right_column .prev_next a.next{ background:url(../img/prev_next_right.png) no-repeat 44px -17px}
141 176
 #right_column .prev_next a.next.disabled, #right_column .prev_next a.next:hover{  background:url(../img/prev_next_right.png) no-repeat -16px -17px;}
142 177
 
143 178
 #right_column .share{margin-top:20px;}
144  
-#right_column .share a{float:left; margin-right:3px;color:#999; border:1px solid #999; padding:0px 20px 0px 1px; line-height:14px;text-decoration:none;font-weight:bold; background:url(../img/share.png) no-repeat right 2px; }
  179
+#right_column .share a{float:left; margin-right:3px;color:#999; border:1px solid #999; padding:0px 20px 0px 1px; line-height:14px;text-decoration:none;font-weight:bold; background:url(../img/share.png) no-repeat right 0px; }
145 180
 #right_column .share ul{list-style-type:none;}
146 181
 #right_column .share li{display:inline;}
147 182
 #right_column .share li a{float:left; display:block; width:15px; height:15px;font-size:1px; text-indent:-9999px;margin-right:3px; padding:0;border:none;}
BIN  assets/html/img/submit.png
157  assets/html/index.html
@@ -37,7 +37,7 @@
37 37
         </ul>
38 38
       </nav>
39 39
       <div class="main_dixit">
40  
-      	<h3>Dixit5</h3>
  40
+      	<h3>ID 5</h3>
41 41
         <div class="dixit_text">
42 42
           ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
43 43
           PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS. 
@@ -53,7 +53,7 @@
53 53
   </div>
54 54
   <div id="middle_column">
55 55
   	<ul id="wrapper">
56  
-    	<li id="about">
  56
+    	<li id="about" style="display:none;">
57 57
         <div class="container">
58 58
           <h3>About <br/>the project</h3>
59 59
           <div class="content">
@@ -65,6 +65,151 @@
65 65
         	<a href="#" title="Write your Dixit">Write your Dixit</a>
66 66
         </div>
67 67
       </li>
  68
+      <li id="login" style="display:none;">
  69
+      	<div class="container">
  70
+      		<h3>LOGIN</h3>
  71
+          <div class="content">
  72
+          	PLEASE SIGN IN WITH ONE OF YOUR EXISTING THIRD PART ACCOUNTS. OR, SIGN UP FOR A LOCALHOST ACCOUNT AND SIGN IN BELOW:
  73
+            <ul class="signin_list">
  74
+            	<li><a href="#" title="Sign in with Facebook">Facebook</a></li>
  75
+            	<li><a href="#" title="Sign in with Twitter">Twitter</a></li>
  76
+            	<li><a href="#" title="Sign in with Google +">Google +</a></li>
  77
+            </ul>
  78
+            
  79
+            <ul class="signup_list">
  80
+            	<li><a href="#" title="Sign in">Sign in</a></li>
  81
+            	<li><a href="#" title="Register">Register</a></li>
  82
+            </ul>
  83
+            
  84
+            <form id="form_signin" method="" action="">
  85
+            	<legend>SIGN IN</legend>
  86
+            	<fieldset>
  87
+              	<p class="clearfix"><label for="login_signin">LOGIN</label><input type="text" id="login_signin" class="input_signin"></p>
  88
+              	<p class="clearfix"><label for="password_signin">Password</label><input type="password" id="password_signin" class="input_signin"></p>
  89
+              	<p class="clearfix"><label for="remember_signin">Remember me</label><input type="checkbox" id="remember_signin" class="checkbox_signin"></p>
  90
+              	<p class="clearfix"><input type="submit" id="submit_signin" value="send" class="submit_form"></p>
  91
+                <p class="clearfix forgot_signin"><label><a href="#">FORGOT PASSWORD?</a></label></p>
  92
+              </fieldset>
  93
+            </form>
  94
+            
  95
+            <form id="form_register" method="" action="">
  96
+            	<legend>Register</legend>
  97
+            	<fieldset>
  98
+              	<p class="clearfix"><label for="login_register">USERNAME</label><input type="text" id="login__register" class="input_signin"></p>
  99
+              	<p class="clearfix"><label for="password_register">Password</label><input type="password" id="password_register" class="input_signin"></p>
  100
+              	<p class="clearfix"><label for="password_register_2">Password (again)</label><input type="password" id="password_register_2" class="input_signin"></p>
  101
+              	<p class="clearfix"><label for="email">Email</label><input type="text" id="email_register" class="input_signin"></p>
  102
+              	<p class="clearfix"><input type="submit" id="submit_signin" value="sign up" class="submit_form"></p>
  103
+              </fieldset>
  104
+            </form>
  105
+          </div>
  106
+        </div>
  107
+      </li>
  108
+      <li id="your_id">
  109
+      	<div class="container">
  110
+      		<h3>YOUR ID</h3>
  111
+          <div class="content">
  112
+          	SED VITAE EUISMOD NISI. PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS.
  113
+            <form id="form_your_id" method="" action="">
  114
+            	<legend></legend>
  115
+            	<fieldset>
  116
+              	<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='lca5zwMmGLNoo6Pc96KzWlvdYtpIRYvt' /></div>
  117
+								<p>
  118
+                	<label for="id_body">*Body:</label> <textarea id="id_body" rows="10" cols="40" name="body" class="input_signin"></textarea>
  119
+                	<span class="errorlist">This field is required.</span>
  120
+                </p>
  121
+                <p>
  122
+                	<label for="id_author">*Author:</label> <input type="text" name="author" id="id_author" class="input_signin"/>
  123
+                	<span class="errorlist">This field is required.</span>
  124
+                </p>
  125
+                <p><label for="id_language">*Language:</label> 
  126
+                	<select name="language" id="id_language"class="input_signin">
  127
+                    <option value="" selected="selected">---------</option>
  128
+                    <option value="ar">Arabic</option>
  129
+                    <option value="az">Azerbaijani</option>
  130
+                    <option value="bg">Bulgarian</option>
  131
+                    <option value="bn">Bengali</option>
  132
+                    <option value="bs">Bosnian</option>
  133
+                    <option value="ca">Catalan</option>
  134
+                    <option value="cs">Czech</option>
  135
+                    <option value="cy">Welsh</option>
  136
+                    <option value="da">Danish</option>
  137
+                    <option value="de">German</option>
  138
+                    <option value="el">Greek</option>
  139
+                    <option value="en">English</option>
  140
+                    <option value="en-gb">British English</option>
  141
+                    <option value="eo">Esperanto</option>
  142
+                    <option value="es">Spanish</option>
  143
+                    <option value="es-ar">Argentinian Spanish</option>
  144
+                    <option value="es-mx">Mexican Spanish</option>
  145
+                    <option value="es-ni">Nicaraguan Spanish</option>
  146
+                    <option value="et">Estonian</option>
  147
+                    <option value="eu">Basque</option>
  148
+                    <option value="fa">Persian</option>
  149
+                    <option value="fi">Finnish</option>
  150
+                    <option value="fr">French</option>
  151
+                    <option value="fy-nl">Frisian</option>
  152
+                    <option value="ga">Irish</option>
  153
+                    <option value="gl">Galician</option>
  154
+                    <option value="he">Hebrew</option>
  155
+                    <option value="hi">Hindi</option>
  156
+                    <option value="hr">Croatian</option>
  157
+                    <option value="hu">Hungarian</option>
  158
+                    <option value="id">Indonesian</option>
  159
+                    <option value="is">Icelandic</option>
  160
+                    <option value="it">Italian</option>
  161
+                    <option value="ja">Japanese</option>
  162
+                    <option value="ka">Georgian</option>
  163
+                    <option value="kk">Kazakh</option>
  164
+                    <option value="km">Khmer</option>
  165
+                    <option value="kn">Kannada</option>
  166
+                    <option value="ko">Korean</option>
  167
+                    <option value="lt">Lithuanian</option>
  168
+                    <option value="lv">Latvian</option>
  169
+                    <option value="mk">Macedonian</option>
  170
+                    <option value="ml">Malayalam</option>
  171
+                    <option value="mn">Mongolian</option>
  172
+                    <option value="nb">Norwegian Bokmal</option>
  173
+                    <option value="ne">Nepali</option>
  174
+                    <option value="nl">Dutch</option>
  175
+                    <option value="nn">Norwegian Nynorsk</option>
  176
+                    <option value="pa">Punjabi</option>
  177
+                    <option value="pl">Polish</option>
  178
+                    <option value="pt">Portuguese</option>
  179
+                    <option value="pt-br">Brazilian Portuguese</option>
  180
+                    <option value="ro">Romanian</option>
  181
+                    <option value="ru">Russian</option>
  182
+                    <option value="sk">Slovak</option>
  183
+                    <option value="sl">Slovenian</option>
  184
+                    <option value="sq">Albanian</option>
  185
+                    <option value="sr">Serbian</option>
  186
+                    <option value="sr-latn">Serbian Latin</option>
  187
+                    <option value="sv">Swedish</option>
  188
+                    <option value="sw">Swahili</option>
  189
+                    <option value="ta">Tamil</option>
  190
+                    <option value="te">Telugu</option>
  191
+                    <option value="th">Thai</option>
  192
+                    <option value="tr">Turkish</option>
  193
+                    <option value="tt">Tatar</option>
  194
+                    <option value="uk">Ukrainian</option>
  195
+                    <option value="ur">Urdu</option>
  196
+                    <option value="vi">Vietnamese</option>
  197
+                    <option value="zh-cn">Simplified Chinese</option>
  198
+                    <option value="zh-tw">Traditional Chinese</option>
  199
+                  </select>
  200
+                	<span class="errorlist">This field is required.</span>
  201
+                </p>
  202
+                <p>
  203
+                	<label for="id_source">*Source:</label> <input id="id_source" type="text" name="source" maxlength="200" class="input_signin" />
  204
+                	<span class="errorlist">This field is required.</span>
  205
+                </p>
  206
+                <p><label for="id_tags">Tags:</label> <input type="text" name="tags" id="id_tags" class="input_signin" placeholder="A comma-separated list of tags." /> <br /><span class="helptext"></span></p>
  207
+                    <input type="submit" value="Submit" class="submit_form" />
  208
+              </fieldset>
  209
+            </form>
  210
+          </div>
  211
+        </div>
  212
+      </li>
68 213
     </ul>
69 214
     <div class="prev_next">
70 215
       <a href="#" title="prev" class="prev disabled">prev</a>
@@ -75,7 +220,7 @@
75 220
     <ul id="wrapper" style="height:400%">	<!--(@partick: calcola altezza come numero item più due zeri)-->
76 221
     	<li>
77 222
         <div class="container">
78  
-          <h3>Dixit4</h3>
  223
+          <h3>ID 4</h3>
79 224
           <div class="dixit_text">
80 225
             ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
81 226
             PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS. 
@@ -98,7 +243,7 @@
98 243
       </li>
99 244
       <li>
100 245
         <div class="container">
101  
-          <h3>Dixit3</h3>
  246
+          <h3>ID 3</h3>
102 247
           <div class="dixit_text">
103 248
             ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
104 249
             PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS. 
@@ -121,7 +266,7 @@
121 266
       </li>
122 267
       <li>
123 268
         <div class="container">
124  
-          <h3>Dixit2</h3>
  269
+          <h3>ID 2</h3>
125 270
           <div class="dixit_text">
126 271
             ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
127 272
             PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS. 
@@ -144,7 +289,7 @@
144 289
 			</li>        
145 290
 			<li>
146 291
       	<div class="container">
147  
-          <h3>Dixit1</h3>
  292
+          <h3>ID 1</h3>
148 293
           <div class="dixit_text">
149 294
             ETIAM ULTRICES PULVINAR ALIQUET. DONEC NEC MAGNA LIBERO. PHASELLUS ULLAMCORPER ANTE IN ARCU IACULIS EGET CONSECTETUR NIBH ALIQUAM. <br />
150 295
             PHASELLUS UT VELIT AC TURPIS SCELERISQUE FAUCIBUS. 

0 notes on commit 061c363

Please sign in to comment.
Something went wrong with that request. Please try again.