Skip to content

Commit 9e16a7f

Browse files
bubbakkbubbakk
committed
Fixed issue #1 
1 parent b0b859f commit 9e16a7f

File tree

4 files changed

+60
-56
lines changed

4 files changed

+60
-56
lines changed

‎CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ TODOS:
99

1010
-> stackable system messages
1111

12+
19.09.2013
13+
----------
14+
- fixed the HTML in the login page: now the panel is positioned in the center without using Bootstrap's row/span/offset
15+
system: browser's page resize do not cause visual issues any more
16+
- moved some login page style in job_default_style.css file (even if there are too many inline style attributes)
1217

1318
sparse day until 15.09.2013
1419
---------------------------

‎cfg/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
define('JOM_DEBUG', true);
44
define('JOM_LOG', true);
55
define('JOM_MILESTONE', '0.4'); // TICKET LISTING version (refer to MILESTONES.md for versioning progression)
6-
define('JOM_RELEASE', '70');
6+
define('JOM_RELEASE', '71');
77
define('JOM_VERSION', JOM_MILESTONE.'.'.JOM_RELEASE); // milestone.release
88
define('JOM_DESC_VER', 'v. '.JOM_MILESTONE.'.x: ticket listing'); // milestone version description
99

‎css/jom_default_style.css

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
body { background:url('../img/sitebg.jpg') }
42

53
/* RIBBON */
@@ -48,3 +46,24 @@ body { background:url('../img/sitebg.jpg') }
4846
opacity: 0;
4947
}
5048

49+
/*
50+
* LOGIN PAGE
51+
*/
52+
.login-form {
53+
width: 350px;
54+
margin: 0 auto;
55+
border: 1px solid #AFAFAF;
56+
border-radius: 10px;
57+
box-shadow: 1px 1px 6px #888;
58+
background-color: white;
59+
padding: 15px;
60+
}
61+
.login-form .form-control {
62+
font-weight: bold;
63+
position: relative;
64+
height: auto;
65+
-webkit-box-sizing: border-box;
66+
-moz-box-sizing: border-box;
67+
box-sizing: border-box;
68+
}
69+
.alert { background-color: rgba(252, 248, 227, 0.8); }

‎login.php

Lines changed: 33 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@
5858
<script language="javascript" type="text/javascript" src="./js/lib/pidCrypt/sha512.js"></script>
5959
<script language="javascript" type="text/javascript" src="./js/generic_lib.js"></script>
6060
<title>JoM - Authentication</title>
61-
<style>
62-
.alert { background-color: rgba(252, 248, 227, 0.8); }
63-
</style>
6461
<script>
6562
$(document).ready(function() {
6663
$('#jom_logo').css('opacity', 0);
@@ -151,7 +148,7 @@ function check_login(el) {
151148
// ajax call to check login and
152149
$.ajax({
153150
url : "./ard.php",
154-
type : "GET",
151+
type : "POST",
155152
dataType : 'json',
156153
data : 'd=usr&r=lin&u=' + username + '&p=' + hashedpass + '&n=' + nonce + '&t=' + timestamp + '&c=login',
157154
success : function(data) {
@@ -199,65 +196,48 @@ function check_login(el) {
199196
</div>
200197
<br>
201198
<br>
202-
<div class="row" style="position: absolute; top: 128px;;">
203-
<div class="span6 offset3" style="padding: 0 15px 0 15px; display: none" id="jom_message_container">
199+
<div style="margin: 0 auto; width: 450px;">
200+
<div style="position: absolute; top: 122px; width: 420px; padding: 0 15px 0 15px; display: none" id="jom_message_container">
204201
<div class="alert text-center" style="box-shadow: 2px 2px 8px #AAA;">
205202
<button type="button" class="close" data-dismiss="alert">&times;</button>
206203
<div id="jom_message"></div>
207204
</div>
208205
</div>
209206
</div>
210-
<div class="row" id="jom_loginpanel">
211-
<div class="span4 offset4" style="border: 1px solid #AFAFAF; border-radius: 10px; box-shadow: 1px 1px 2px #888; background-color: white; padding: 15px;">
212-
<div class="row">
213-
<div class="span1">
214-
<img src="./img/user_info.png" alt="Authentication icon" title="Authentication">
215-
</div>
216-
<div class="span3 text-center">
217-
<h2>Authentication</h2>
218-
</div>
207+
208+
<div class="login-form" id="jom_loginpanel">
209+
<div style="border-bottom: 1px solid lightgray;">
210+
<h2><img src="./img/user_info.png" alt="Authentication icon" title="Authentication" style="vertical-align: text-bottom;"> Authentication</h2>
211+
</div>
212+
<br>
213+
<div class="text-center">
214+
<div class="input-prepend">
215+
<span class="add-on"><i class="icon-user"></i></span>
216+
<input id="user" type="text" class="form-control" placeholder="Username or email">
219217
</div>
220-
<div class="row">
221-
<div class="span4">
222-
<legend style="margin-bottom: 5px"></legend>
223-
<div style="padding: 0px 15px 0 55px;">
224-
<label style="padding-top: 15px;">User name or email</label>
225-
<div class="input-prepend">
226-
<span class="add-on"><i class="icon-user"></i></span>
227-
<input id="user" type="text" style="font-size: 18px; font-weight: bold;">
228-
</div>
229-
<label>Password</label>
230-
<div class="input-prepend">
231-
<span class="add-on"><i class="icon-key"></i></span>
232-
<input id="pass" type="password" style="font-size: 18px; font-weight: bold;">
233-
</div>
234-
<?php echo generate_html_input_form_nonces( '/users/login', 0, session_id(), $config['SALT'], $config['HASH_ALG'] ); ?>
235-
</div>
236-
</div>
218+
<div class="input-prepend">
219+
<span class="add-on"><i class="icon-key"></i></span>
220+
<input id="pass" type="password" class="form-control" placeholder="password">
237221
</div>
238-
<div class="row" style="margin-top: 5px;">
239-
<div class="span2 offset1 text-center">
240-
<button id="submit" type="submit" class="btn" onclick='javascript: check_login(this);'><i class="icon-signin"></i> Enter</button>
241-
</div>
222+
<?php echo generate_html_input_form_nonces( '/users/login', 0, session_id(), $config['SALT'], $config['HASH_ALG'] ); ?>
223+
<div>
224+
<button id="submit" type="submit" class="btn" onclick='javascript: check_login(this);'><i class="icon-signin"></i> Enter</button>
242225
</div>
243-
<br>
244-
<div class="row">
245-
<div class="span4" id="jom_infopanelctrl" style="cursor: pointer;">
246-
<i class="icon-info-sign"></i> show details...</div>
226+
<div class="text-left" id="jom_infopanelctrl" style="cursor: pointer;">
227+
<i class="icon-info-sign"></i> show details...
247228
</div>
248-
<div class="row" id="jom_infopanel">
249-
<div class="span4">
250-
<p style="border-top: 1px solid #E5E5E5; padding-top: 5px;" class="text-right">
251-
<em style="font-size: 8px;">(c) Andrea Ferroni<br>
252-
This software is distributed under the terms of the<br>
253-
<a href='./COPYING' target='_blanc'>GNU Affero General Public License</a>.
254-
</em>
255-
</p>
256-
<p class="text-right">
257-
<a href="https://github.com/bubbakk/JoM" target="_blanc"><i class="icon-github"></i> Join the project</a><br>
258-
<a href="https://twitter.com/bubbakk" target="_blanc"><i class="icon-twitter"></i> Tweet me @bubbakk</a>
259-
</p>
260-
</div>
229+
<div id="jom_infopanel">
230+
<p style="border-top: 1px solid #E5E5E5; padding-top: 5px;" class="text-right">
231+
<em style="font-size: 8px;">(c) 2013, 2013 Andrea Ferroni<br>
232+
This software is distributed under the terms of the<br>
233+
<a href='./COPYING' target='_blanc'>GNU Affero General Public License</a>.
234+
</em>
235+
</p>
236+
<p class="text-right">
237+
<a href="https://github.com/bubbakk/JoM" target="_blanc"><i class="icon-github"></i> Join the project</a><br>
238+
<a href="https://twitter.com/bubbakk" target="_blanc"><i class="icon-twitter"></i> Follow me on Twitter</a>
239+
</p>
240+
261241
</div>
262242
</div>
263243
</div>

0 commit comments

Comments
 (0)