improve admin page design ・ 3257453 ・ Gitprep

- improve admin page design;
- Browse files
- Yuki Kimoto commited on 2016-01-23
- 1 parent 43be7a6
  
  commit 325745334c95dc90f3ec53dad4eae815358b5c8d

Showing 5 changed files with 54 additions and 63 deletions

+5 -8

public/css/bootstrap.css

@@ -2184,7 +2184,7 @@ button.close {
   color:#767676;
 }
 
-.login-form {
+.user-form {
   border:1px solid #d8d8d8;
   border-radius: 3px;
   padding:25px 0;
@@ -2193,24 +2193,21 @@ button.close {
   margin-right:auto
 }
 
-.login-form-container {
+.user-form-container {
   width:70%;
   margin:0 auto;
 }
 
-.login-form input[type=text], .login-form input[type=password] {
-  border:1px solid #d8d8d8;
-  border-radius: 3px;
-  padding:7px 5px;
+.user-form input[type=text], .user-form input[type=password] {
   width:100%;
   margin:5px 0;
 }
 
-.login-form input[type=checkbox] {
+.user-form input[type=checkbox] {
   margin:6px 0 9px 0;
 }
 
-.login-form button {
+.user-form button {
   width:100%;
 }
 

+15 -15

templates/auto/_admin/user/create.html.ep

View

@@ -75,29 +75,29 @@
       </div>
     % }
     
-    <div class="text-center"><h3>Create User</h3></div>
-    <div class="well" style="background:white;padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto">
-      <form action="<%= url_for->query(op => 'create') %>" method="post">
-        <div class="control-group">
-          <label class="control-label" for="user-name">User name</label>
-          <div class="controls">
+    <div class="topic1" style="text-align:center">Create User</div>
+    <form class="user-form" action="<%= url_for->query(op => 'create') %>" method="post">
+      <div class="user-form-container">
+        <div>
+          <div>User name</div>
+          <div>
             <%= text_field id => $id, placeholder => 'User', id =>'user-name'%>
           </div>
         </div>
-        <div class="control-group">
-          <label class="control-label" for="input-password">Password</label>
-          <div class="controls">
+        <div>
+          <div>Password</div>
+          <div>
             <%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
             <%= password_field 'password2', id => 'input-password', placeholder => 'Password Again' %>
           </div>
         </div>
-        <div class="control-group">
-          <div class="controls">
-            <button type="submit" class="btn">Create User</button>
+        <div>
+          <div>
+            <button type="submit" class="btn btn-success" style="margin-top:20px">Create User</button>
           </div>
         </div>
-      </form>
-    </div>
-    <div class="text-center" style="margin-bottom:20px"><big><a href="<%= url_for('/_admin/users') %>">Users</a></big></div>
+      </div>
+    </form>
+    <div style="text-align:center;margin:20px 0"><big><a href="<%= url_for('/_admin/users') %>">Users</a></big></div>
   </div>
   %= include '/include/footer';

+6 -6

templates/auto/_login.html.ep

View

@@ -127,24 +127,24 @@
       Sign in to GitPrep
     </div>
     
-    <form class="login-form" action="<%= url_for->query(op => 'login') %>" method="post">
-      <div class="login-form-container">
+    <form class="user-form" action="<%= url_for->query(op => 'login') %>" method="post">
+      <div class="user-form-container">
         <div>
-          <label>Username</label>
+          <div>Username</div>
           <div>
             <%= input_tag id => $id, type => 'text', placeholder => 'User', id =>'user-name'%>
           </div>
         </div>
         <div>
-          <labelfor="input-password">Password</label>
+          <div>Password</div>
           <div>
             <%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
           </div>
         </div>
         <div>
-          <label>
+          <div>
             <input type="checkbox" name="save" value="1"> Save
-          </label>
+          </div>
         </div>
         <div>
           <div>

+13 -15

templates/auto/_start.html.ep

View

@@ -70,29 +70,27 @@
         % }
       </div>
     % }
-    <div class="text-center"><h3>Create Admin User</h3></div>
-    <div class="well" style="background:white;padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto">
-      <form action="<%= url_for->query(op => 'create') %>" method="post">
-        <div class="control-group">
-          <label class="control-label" for="user-name">User name</label>
-          <div>
+    <div class="topic1" style="text-align:center"><h3>Create Admin User</h3></div>
+    <form class="user-form" action="<%= url_for->query(op => 'create') %>" method="post">
+      <div class="user-form-container">
+        <div>
+          <div>User name</div>
+          <div style="margin-bottom:10px;">
             <b>admin</b>
           </div>
         </div>
-        <div class="control-group">
-          <label class="control-label" for="input-password">Password</label>
-          <div class="controls">
+        <div>
+          <div>Password</div>
+          <div>
             <%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
             <%= password_field 'password2', id => 'input-password', placeholder => 'Password Again' %>
           </div>
         </div>
-        <div class="control-group">
-          <div class="controls">
-            <button type="submit" class="btn">Create Admin User</button>
-          </div>
+        <div>
+          <button type="submit" class="btn btn-success" style="margin-top:20px">Create Admin User</button>
         </div>
-      </form>
-    </div>
+      </div>
+    </form>
   </div>
 
   %= include '/include/footer';

+15 -19

templates/auto/reset-password.html.ep

View

@@ -107,32 +107,28 @@
         % }
       </div>
     % }
-    <div class="text-center"><h3>Reset Password</h3></div>
-    <div class="well" style="background:white;padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto">
-      <form action="<%= url_for->query(op => 'reset') %>" method="post">
-        <div class="control-group">
-          <label class="control-label" for="user-name">User name</label>
-          <div>
-            <b><%= $user %></b>
-            %= hidden_field user => $user;
-          </div>
+    <div class="topic1" style="text-align:center"><h3>Reset Password</h3></div>
+    <form class="user-form" action="<%= url_for->query(op => 'reset') %>" method="post">
+      <div class="user-form-container">
+        <div>User name</div>
+        <div style="margin:1px 0 10px 0">
+          <b><%= $user %></b>
+          %= hidden_field user => $user;
         </div>
-        <div class="control-group">
-          <label class="control-label" for="input-password">Password</label>
-          <div class="controls">
+        <div>
+          <div>Password</div>
+          <div>
             <%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
             <%= password_field 'password2', id => 'input-password', placeholder => 'Password Again' %>
           </div>
         </div>
-        <div class="control-group">
-          <div class="controls">
-            <button type="submit" class="btn">Reset Password</button>
-          </div>
+        <div style="margin-top:20px">
+          <button type="submit" class="btn btn-success">Reset Password</button>
         </div>
-      </form>
-    </div>
+      </div>
+    </form>
     % if ($logined_admin) {
-      <div class="text-center" style="margin-bottom:20px;font-size:120%"><a href="<%= url_for('_admin/users') %>">Users</a></div>
+      <div style="text-align:center;margin:20px 0;font-size:120%"><a href="<%= url_for('_admin/users') %>">Users</a></div>
     % }
   </div>
 

...	...	@@ -2184,7 +2184,7 @@ button.close {
2184	2184	color:#767676;
2185	2185	}
2186	2186
2187		-.login-form {
	2187	+.user-form {
2188	2188	border:1px solid #d8d8d8;
2189	2189	border-radius: 3px;
2190	2190	padding:25px 0;
...	...	@@ -2193,24 +2193,21 @@ button.close {
2193	2193	margin-right:auto
2194	2194	}
2195	2195
2196		-.login-form-container {
	2196	+.user-form-container {
2197	2197	width:70%;
2198	2198	margin:0 auto;
2199	2199	}
2200	2200
2201		-.login-form input[type=text], .login-form input[type=password] {
2202		- border:1px solid #d8d8d8;
2203		- border-radius: 3px;
2204		- padding:7px 5px;
	2201	+.user-form input[type=text], .user-form input[type=password] {
2205	2202	width:100%;
2206	2203	margin:5px 0;
2207	2204	}
2208	2205
2209		-.login-form input[type=checkbox] {
	2206	+.user-form input[type=checkbox] {
2210	2207	margin:6px 0 9px 0;
2211	2208	}
2212	2209
2213		-.login-form button {
	2210	+.user-form button {
2214	2211	width:100%;
2215	2212	}
2216	2213

...	...	@@ -127,24 +127,24 @@
127	127	Sign in to GitPrep
128	128	</div>
129	129
130		- <form class="login-form" action="<%= url_for->query(op => 'login') %>" method="post">
131		- <div class="login-form-container">
	130	+ <form class="user-form" action="<%= url_for->query(op => 'login') %>" method="post">
	131	+ <div class="user-form-container">
132	132	<div>
133		- <label>Username</label>
	133	+ <div>Username</div>
134	134	<div>
135	135	<%= input_tag id => $id, type => 'text', placeholder => 'User', id =>'user-name'%>
136	136	</div>
137	137	</div>
138	138	<div>
139		- <labelfor="input-password">Password</label>
	139	+ <div>Password</div>
140	140	<div>
141	141	<%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
142	142	</div>
143	143	</div>
144	144	<div>
145		- <label>
	145	+ <div>
146	146	<input type="checkbox" name="save" value="1"> Save
147		- </label>
	147	+ </div>
148	148	</div>
149	149	<div>
150	150	<div>

...	...	@@ -107,32 +107,28 @@
107	107	% }
108	108	</div>
109	109	% }
110		- <div class="text-center"><h3>Reset Password</h3></div>
111		- <div class="well" style="background:white;padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto">
112		- <form action="<%= url_for->query(op => 'reset') %>" method="post">
113		- <div class="control-group">
114		- <label class="control-label" for="user-name">User name</label>
115		- <div>
116		- <b><%= $user %></b>
117		- %= hidden_field user => $user;
118		- </div>
	110	+ <div class="topic1" style="text-align:center"><h3>Reset Password</h3></div>
	111	+ <form class="user-form" action="<%= url_for->query(op => 'reset') %>" method="post">
	112	+ <div class="user-form-container">
	113	+ <div>User name</div>
	114	+ <div style="margin:1px 0 10px 0">
	115	+ <b><%= $user %></b>
	116	+ %= hidden_field user => $user;
119	117	</div>
120		- <div class="control-group">
121		- <label class="control-label" for="input-password">Password</label>
122		- <div class="controls">
	118	+ <div>
	119	+ <div>Password</div>
	120	+ <div>
123	121	<%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
124	122	<%= password_field 'password2', id => 'input-password', placeholder => 'Password Again' %>
125	123	</div>
126	124	</div>
127		- <div class="control-group">
128		- <div class="controls">
129		- <button type="submit" class="btn">Reset Password</button>
130		- </div>
	125	+ <div style="margin-top:20px">
	126	+ <button type="submit" class="btn btn-success">Reset Password</button>
131	127	</div>
132		- </form>
133		- </div>
	128	+ </div>
	129	+ </form>
134	130	% if ($logined_admin) {
135		- <div class="text-center" style="margin-bottom:20px;font-size:120%"><a href="<%= url_for('_admin/users') %>">Users</a></div>
	131	+ <div style="text-align:center;margin:20px 0;font-size:120%"><a href="<%= url_for('_admin/users') %>">Users</a></div>
136	132	% }
137	133	</div>
138	134

...	...	@@ -75,29 +75,29 @@
75	75	</div>
76	76	% }
77	77
78		- <div class="text-center"><h3>Create User</h3></div>
79		- <div class="well" style="background:white;padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto">
80		- <form action="<%= url_for->query(op => 'create') %>" method="post">
81		- <div class="control-group">
82		- <label class="control-label" for="user-name">User name</label>
83		- <div class="controls">
	78	+ <div class="topic1" style="text-align:center">Create User</div>
	79	+ <form class="user-form" action="<%= url_for->query(op => 'create') %>" method="post">
	80	+ <div class="user-form-container">
	81	+ <div>
	82	+ <div>User name</div>
	83	+ <div>
84	84	<%= text_field id => $id, placeholder => 'User', id =>'user-name'%>
85	85	</div>
86	86	</div>
87		- <div class="control-group">
88		- <label class="control-label" for="input-password">Password</label>
89		- <div class="controls">
	87	+ <div>
	88	+ <div>Password</div>
	89	+ <div>
90	90	<%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
91	91	<%= password_field 'password2', id => 'input-password', placeholder => 'Password Again' %>
92	92	</div>
93	93	</div>
94		- <div class="control-group">
95		- <div class="controls">
96		- <button type="submit" class="btn">Create User</button>
	94	+ <div>
	95	+ <div>
	96	+ <button type="submit" class="btn btn-success" style="margin-top:20px">Create User</button>
97	97	</div>
98	98	</div>
99		- </form>
100		- </div>
101		- <div class="text-center" style="margin-bottom:20px"><big><a href="<%= url_for('/_admin/users') %>">Users</a></big></div>
	99	+ </div>
	100	+ </form>
	101	+ <div style="text-align:center;margin:20px 0"><big><a href="<%= url_for('/_admin/users') %>">Users</a></big></div>
102	102	</div>
103	103	%= include '/include/footer';

...	...	@@ -70,29 +70,27 @@
70	70	% }
71	71	</div>
72	72	% }
73		- <div class="text-center"><h3>Create Admin User</h3></div>
74		- <div class="well" style="background:white;padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto">
75		- <form action="<%= url_for->query(op => 'create') %>" method="post">
76		- <div class="control-group">
77		- <label class="control-label" for="user-name">User name</label>
78		- <div>
	73	+ <div class="topic1" style="text-align:center"><h3>Create Admin User</h3></div>
	74	+ <form class="user-form" action="<%= url_for->query(op => 'create') %>" method="post">
	75	+ <div class="user-form-container">
	76	+ <div>
	77	+ <div>User name</div>
	78	+ <div style="margin-bottom:10px;">
79	79	<b>admin</b>
80	80	</div>
81	81	</div>
82		- <div class="control-group">
83		- <label class="control-label" for="input-password">Password</label>
84		- <div class="controls">
	82	+ <div>
	83	+ <div>Password</div>
	84	+ <div>
85	85	<%= password_field 'password', id => 'input-password', placeholder => 'Password' %>
86	86	<%= password_field 'password2', id => 'input-password', placeholder => 'Password Again' %>
87	87	</div>
88	88	</div>
89		- <div class="control-group">
90		- <div class="controls">
91		- <button type="submit" class="btn">Create Admin User</button>
92		- </div>
	89	+ <div>
	90	+ <button type="submit" class="btn btn-success" style="margin-top:20px">Create Admin User</button>
93	91	</div>
94		- </form>
95		- </div>
	92	+ </div>
	93	+ </form>
96	94	</div>
97	95
98	96	%= include '/include/footer';