LenaSYS

Merge lp:~a11andoh/lenasys/registrationfix into lp:lenasys

  1. registrationfix
  2. Merge into trunk
Proposed by Anders Ohlson
Status: Merged
Merged at revision: 129
Proposed branch: lp:~a11andoh/lenasys/registrationfix
Merge into: lp:lenasys
Diff against target: 214 lines (+120/-48)
4 files modified
codeigniter/application/models/user.php (+27/-0)
codeigniter/application/views/registrationInstructor.php (+36/-34)
codeigniter/application/views/registrationStudent.php (+39/-0)
codeigniter/css/registration.css (+18/-14)
To merge this branch: bzr merge lp:~a11andoh/lenasys/registrationfix
Reviewer Review Type Date Requested Status
lenasysmaint Pending
Review via email: mp+166490@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'codeigniter/application/models/user.php'
2--- codeigniter/application/models/user.php 2013-05-28 09:33:53 +0000
3+++ codeigniter/application/models/user.php 2013-05-30 11:53:29 +0000
4@@ -394,6 +394,33 @@
5 return FALSE;
6 }
7
8+ /*
9+ * This function returns the name (or FALSE if user isn't logged in).
10+ * RESTRICTED-LEVEL: System
11+ */
12+ public function getName() {
13+ if($this->isLoggedIn()) {
14+ $temp = $this->session->userdata('authenticated');
15+ return $temp['name'];
16+ }
17+
18+ return FALSE;
19+ }
20+
21+ /*
22+ * This function returns the SSN (or FALSE if user isn't logged in).
23+ * RESTRICTED-LEVEL: System
24+ */
25+ public function getSSN() {
26+ if($this->isLoggedIn()) {
27+ $temp = $this->session->userdata('authenticated');
28+ return $temp['ssn'];
29+ }
30+
31+ return FALSE;
32+ }
33+
34+
35 /*
36 * This function fetches the active course info
37 */
38
39=== modified file 'codeigniter/application/views/registrationInstructor.php'
40--- codeigniter/application/views/registrationInstructor.php 2013-05-30 09:14:33 +0000
41+++ codeigniter/application/views/registrationInstructor.php 2013-05-30 11:53:29 +0000
42@@ -1,37 +1,39 @@
43-<div id="regWrapper">
44- <div id="regHeader">
45- <span id="regHeader">
46- Welcome to LenaSYS
47- </span>
48- </div>
49- <div id="regformcontenttext">To complete your registration,</br>
50- please enter your account information.</div>
51- <div id="regForm">
52- <table>
53- <tr>
54- <td>Username:</td><td><?php $userName ?></td>
55- </tr>
56- <tr>
57- <td>Full Name:</td><td><input id="fullName" type="text" name="fullName" placeholder="--Full name--"></td>
58- </tr>
59- <tr>
60- <td>Social Security Number:</td><td><input id="ssn" type="text" name="ssn" placeholder="--YYMMDD-XXXX--"></td>
61- </tr>
62- <tr>
63- <td>New Password:</td><td id="grayText"><input id="newPassword" type="text" name="password" placeholder="--Password--"></td>
64- </tr>
65- <tr>
66- <td>Repeat Password:</td><td><input id="repeatPassword" type="text" name="repeatPassword" placeholder="--Repeat Password--"></td>
67- </tr>
68- <tr>
69- <td>Password Hint:</td><td><input id="pHint" type="text" name="hint" placeholder="--Password Hint--"></td>
70- </tr>
71- <tr>
72- <td colspan="2"><div id="buttonposition"><input type="submit" value="Confirm"></div></td>
73- </tr>
74- </table>
75- </div>
76+<div id="bigwrapper">
77+ <div id="regWrapper">
78+ <div id="regHeader">
79+ <span id="regHeader">
80+ Welcome to LenaSYS
81+ </span>
82+ </div>
83+ <div id="regformcontenttext">
84+ To complete your registration,</br>
85+ please enter your account information.</div>
86+ <div id="regForm">
87+ <table>
88+ <tr>
89+ <td>Username:</td><td><?php echo $userName; ?></td>
90+ </tr>
91+ <tr>
92+ <td>Full Name:</td><td><input id="fullName" type="text" name="fullName" placeholder="--Full name--"></td>
93+ </tr>
94+ <tr>
95+ <td>Social Security Number:</td><td><input id="ssn" type="text" name="ssn" placeholder="--YYMMDD-XXXX--"></td>
96+ </tr>
97+ <tr>
98+ <td>New Password:</td><td id="grayText"><input id="newPassword" type="text" name="password" placeholder="--Password--"></td>
99+ </tr>
100+ <tr>
101+ <td>Repeat Password:</td><td><input id="repeatPassword" type="text" name="repeatPassword" placeholder="--Repeat Password--"></td>
102+ </tr>
103+ <tr>
104+ <td>Password Hint:</td><td><input id="pHint" type="text" name="hint" placeholder="--Password Hint--"></td>
105+ </tr>
106+ <tr>
107+ <td colspan="2"><div id="buttonposition"><input type="submit" value="Confirm" class="confirmbuttonlooks"></div></td>
108+ </tr>
109+ </table>
110+ </div>
111+ </div>
112 </div>
113-
114
115
116
117=== added file 'codeigniter/application/views/registrationStudent.php'
118--- codeigniter/application/views/registrationStudent.php 1970-01-01 00:00:00 +0000
119+++ codeigniter/application/views/registrationStudent.php 2013-05-30 11:53:29 +0000
120@@ -0,0 +1,39 @@
121+<div id="bigwrapper">
122+ <div id="regWrapper">
123+ <div id="regHeader">
124+ <span id="regHeader">
125+ Welcome to LenaSYS
126+ </span>
127+ </div>
128+ <div id="regformcontenttext">
129+ To complete your registration,</br>
130+ please enter your account information.</div>
131+ <div id="regForm">
132+ <table>
133+ <tr>
134+ <td>Username:</td><td><?php echo $userName; ?></td>
135+ </tr>
136+ <tr>
137+ <td>Full Name:</td><td><?php echo $name; ?></td>
138+ </tr>
139+ <tr>
140+ <td>Social Security Number:</td><td><?php echo $SSN; ?></td>
141+ </tr>
142+ <tr>
143+ <td>New Password:</td><td id="grayText"><input id="newPassword" type="text" name="password" placeholder="--Password--"></td>
144+ </tr>
145+ <tr>
146+ <td>Repeat Password:</td><td><input id="repeatPassword" type="text" name="repeatPassword" placeholder="--Repeat Password--"></td>
147+ </tr>
148+ <tr>
149+ <td>Password Hint:</td><td><input id="pHint" type="text" name="hint" placeholder="--Password Hint--"></td>
150+ </tr>
151+ <tr>
152+ <td colspan="2"><div id="buttonposition"><input type="submit" value="Confirm" class="confirmbuttonlooks"></div></td>
153+ </tr>
154+ </table>
155+ </div>
156+ </div>
157+</div>
158+
159+
160
161=== modified file 'codeigniter/css/registration.css'
162--- codeigniter/css/registration.css 2013-05-30 09:14:33 +0000
163+++ codeigniter/css/registration.css 2013-05-30 11:53:29 +0000
164@@ -1,17 +1,14 @@
165-/* DEnna måste kastas sedan*/
166-
167-
168-html {
169- font-size:125%;
170-}
171-
172-body {
173- font-size: 50%;
174- font-family: Arial;
175+#bigwrapper {
176+ position:absolute;
177+ top:54px;
178+ width:1024px;
179+ margin: 0 auto;
180+ left:50%;
181+ margin-left:-351px;
182 }
183
184 #regWrapper {
185- width: 677px;
186+ width: 697px;
187 border: 1px solid #cccccc;
188 background: #f5f5f5;
189 text-align: center;
190@@ -31,14 +28,21 @@
191 border-radius: 5px;
192 }
193
194-
195+.confirmbuttonlooks {
196+ padding:4px;
197+ border:gray solid 1px;
198+}
199+.confirmbuttonlooks:hover {
200+ background-image: linear-gradient(to bottom,#fff,#ccc);
201+ -webkit-box-shadow: 0px 0px 1px 1px #999;
202+ box-shadow: 0px 0px 1px 1px #999;
203+}
204 #regForm td{
205 padding: 5px;
206 }
207
208 #buttonposition {
209-
210- padding-left: 152px;
211+ padding-left: 0px;
212 }
213
214 #regformcontenttext {

Subscribers

People subscribed via source and target branches

to all changes: