Showing 3 changed files with 76 additions and 70 deletions
+26 -3
public/css/bootstrap.css
... ...
@@ -2222,20 +2222,43 @@ button.close {
2222 2222
   width:85%;
2223 2223
 }
2224 2224
 
2225
-.profile > div {
2225
+.user-settings-container > div {
2226 2226
   border:1px solid #d8d8d8;
2227 2227
   padding:10px 10px;
2228 2228
   font-size:120%;
2229
+  margin-bottom:20px;
2229 2230
 }
2230 2231
 
2231
-.profile > div:first-child {
2232
+.user-settings-container > div:first-child {
2232 2233
   border-bottom:none;
2233 2234
   background: #eee;
2234 2235
   border-radius:3px 3px 0 0;
2235
-  font-size:17px;
2236
+  font-size:14px;
2236 2237
   font-weight:bold;
2238
+  margin-bottom:0;
2237 2239
 }
2238 2240
 
2239 2241
 .profile li {
2240 2242
   padding:5px 5px;
2241 2243
 }
2244
+
2245
+.ssh-keys form {
2246
+  margin:5px 0;
2247
+}
2248
+
2249
+.ssh-key-add input[type=text] {
2250
+  border:1px solid #d8d8d8;
2251
+  border-radius: 3px;
2252
+  padding:6px 5px;
2253
+  margin:5px 0;
2254
+  width:60%;
2255
+}
2256
+
2257
+.ssh-key-add textarea {
2258
+  border:1px solid #d8d8d8;
2259
+  border-radius: 3px;
2260
+  padding:6px 5px;
2261
+  margin:5px 0;
2262
+  width:100%;
2263
+  min-height:200px;
2264
+}
+1 -1
templates/user-settings.html.ep
... ...
@@ -30,7 +30,7 @@
30 30
         </ul>
31 31
       </div>
32 32
       <div class="right">
33
-        <div class="profile">
33
+        <div class="user-settings-container profile">
34 34
           <div>
35 35
             Profile
36 36
           </div>
+49 -66
templates/user-settings/ssh.html.ep
... ...
@@ -157,89 +157,72 @@
157 157
   %= include '/include/header';
158 158
   
159 159
   <div class="container">
160
-    <ul class="breadcrumb" style="margin-top:10px">
161
-      <li><a href="<%= url_for('/') %>">Home</a></li>
162
-      /
163
-      <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
164
-    </ul>
165
-    <div style="margin-bottom:30px">
166
-      <div class="row">
167
-        <div class="span2">
168
-          <ul class="nav nav-tabs nav-stacked">
169
-            <li class="" style="font-weight:bold">
170
-              <a href="<%= url_for("/$user/_settings") %>">Profile</a>
171
-            </li>
172
-            <li class="active" style="">
173
-              <a href="<%= url_for("/$user/_settings/ssh") %>">SSH keys</a>
174
-            </li>
175
-          </ul>
176
-        </div>
177
-        <div class="span10">
178
-          <%= include '/include/errors', errors => $errors %>
179
-          <%= include '/include/message', message => flash('message') %>
180
-          
181
-          <div class="border-gray bk-gray-light radius-top" style="padding:5px;">
182
-            <div style="padding:5px">
183
-              <span style="font-size:15px;font-weight:bold;">SSH Keys</span> (<a href="<%= url_for("/$user.keys") %>">see</a>)
160
+    <div class="user-settings">
161
+      <div class="left">
162
+        <ul>
163
+          <li>
164
+            <a href="<%= url_for("/$user/_settings") %>">Profile</a>
165
+          </li>
166
+          <li class="active">
167
+            <a href="<%= url_for("/$user/_settings/ssh") %>">SSH keys</a>
168
+          </li>
169
+        </ul>
170
+      </div>
171
+      <div class="right">
172
+        <%= include '/include/errors', errors => $errors %>
173
+        <%= include '/include/message', message => flash('message') %>
174
+        
175
+        <div class="user-settings-container ssh-keys">
176
+          <div>
177
+            <div>
178
+              <span>SSH Keys</span> (<a href="<%= url_for("/$user.keys") %>">see</a>)
184 179
             </div>
185 180
           </div>
186
-          <div style="margin-bottom:30px">
181
+          <div>
187 182
             % if (@$keys > 0) {
188
-              <div class="border-gray" style="border-top:none;padding:10px">
183
+              <div>
189 184
                 This is a list of SSH keys associated with your account. Remove any keys that you do not recognize.
190 185
               </div>
191 186
               % for my $key (@$keys) {
192
-                <form action="<%= url_for->query(op => 'delete') %>" method="post" style="margin:0;padding:0">
193
-                  <div class="border-gray" style="border-top:none;">
194
-                    <div class="row">
195
-                      <div class="span7" style="width:600px">
196
-                        <div style="font-size:15px;padding:10px">
197
-                          <div>
198
-                            <b><%= $key->{title} %></b>
199
-                          </div>
200
-                        </div>
201
-                      </div>
202
-                      <div class="span2">
203
-                        <div style="padding:5px;text-align:right">
204
-                          <a class="btn btn-danger" href="javascript:void(0)" onclick="$(this).closest('form').submit()">Delete</a>
205
-                          <%= hidden_field 'row-id' => $key->{row_id} %>
206
-                        </div>
207
-                      </div>
208
-                    </div>
187
+                <form action="<%= url_for->query(op => 'delete') %>" method="post">
188
+                  <div>
189
+                    <b><%= $key->{title} %></b>
190
+                    <a class="btn btn-small btn-danger" href="javascript:void(0)" onclick="$(this).closest('form').submit()">Delete</a>
191
+                    <%= hidden_field 'row-id' => $key->{row_id} %>
209 192
                   </div>
210 193
                 </form>
211 194
               % }
212 195
             % } else {
213
-              <div class="border-gray" style="margin-bottom:30px;border-top:none;padding:10px">
196
+              <div>
214 197
                 SSH key don't exists.
215 198
               </div>
216 199
             % }
217 200
           </div>
218
-          
201
+        </div>
202
+        
203
+        <div class="user-settings-container ssh-key-add">
219 204
           <div>
220
-            <div class="border-gray bk-gray-light radius-top" style="padding:5px;font-weight:bold;font-size:17px">
221
-              <div style="font-size:15px;padding:5px">
222
-                Add an SSH Key
223
-              </div>
224
-            </div>
225
-            <div class="border-gray" style="margin-bottom:30px;border-top:none;padding:10px">
226
-              <form action="<%= url_for->query(op => 'add') %>" method="post" %>
227
-                <div style="margin-bottom:5px">
228
-                  Title
229
-                </div>
230
-                <div>
231
-                  <%= text_field 'title', style => "width:400px" %>
232
-                </div>
233
-                <div style="margin-bottom:5px">
234
-                  Key
235
-                </div>
236
-                <div>
237
-                  <%= text_area 'key', style => "width:730px;height:200px" %>
238
-                </div>
239
-                <input type="submit" class="btn btn-success" value="Add key">
240
-              </form>
205
+            <div>
206
+              Add an SSH Key
241 207
             </div>
242 208
           </div>
209
+          <div>
210
+            <form action="<%= url_for->query(op => 'add') %>" method="post" %>
211
+              <div>
212
+                Title
213
+              </div>
214
+              <div>
215
+                <%= text_field 'title' %>
216
+              </div>
217
+              <div>
218
+                Key
219
+              </div>
220
+              <div>
221
+                <%= text_area 'key' %>
222
+              </div>
223
+              <input type="submit" class="btn btn-success" value="Add key">
224
+            </form>
225
+          </div>
243 226
         </div>
244 227
       </div>
245 228
     </div>