Skip to content

Commit 2e62ebf

Browse files
committed
Merge branch 'master' of github.com:ranacseruet/codeigniterplus.git into demo.codesamplez
2 parents e76a6b7 + 9324e1a commit 2e62ebf

File tree

4 files changed

+45
-60
lines changed

4 files changed

+45
-60
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Codeigniterplus (The Ultimate Codeigniter Enhancements)
44
Codeigniterplus is an super light-weight codeigniter based extension with various other third party libraries. This will help developers
55
to have a kick-ass start along their way to web application development.
66

7+
(View Live Demo: http://demo.codesamplez.com/codeigniterplus/)
8+
79
(And introductory post to codeigniterplus: http://codesamplez.com/project/codeigniter-bundle )
810

911
Release Note For v1.1.0
Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
1-
<fieldset>
2-
<legend>Login</legend>
3-
4-
<form action="{$action_url}" method="post">
5-
<div class="row">
6-
<label class="control-label" for="username">Username</label>
7-
<input type="text" name="username" value="" id="username" size="30" />
8-
</div>
9-
10-
<div class="row">
11-
<label class="control-label" for="password">Password</label>
12-
<input type="password" name="password" value="" id="password" size="30" />
13-
</div>
14-
15-
<div class="row">
16-
<input type="checkbox" name="remember" value="1" id="remember" /> <label class="control-label" for="remember">Remember me</label>
17-
<a href="{$base_url}{$forgot_password_uri}">Forgot password</a> |
18-
{if $allow_registration}
1+
<div class="span12">
2+
<form action="{$action_url}" method="post">
3+
<fieldset>
4+
<legend>Login</legend>
5+
<label class="control-label" for="username">Username</label>
6+
<input type="text" name="username" value="" id="username" size="30" />
7+
<label class="control-label" for="password">Password</label>
8+
<input type="password" name="password" value="" id="password" size="30" />
9+
<label class="checkbox" for="remember">
10+
<input type="checkbox" name="remember" value="1" id="remember" /> Remember me
11+
</label>
12+
<a href="{$base_url}{$forgot_password_uri}">Forgot password</a> |
13+
{if $allow_registration}
1914
<a href="{$base_url}{$register_uri}">Register</a>
20-
{/if}
21-
</div>
22-
23-
<div class="row">
24-
<input type="submit" name="login" value="Login" class="btn" />
25-
</div>
15+
{/if}
16+
<input type="submit" name="login" value="Login" class="btn" />
17+
</fieldset>
2618
</form>
27-
</fieldset>
19+
</div>
20+
Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
<fieldset>
2-
<legend>Register</legend>
1+
<div class="span12">
32
<form action="{$action_url}" method="post">
4-
<div class="controls">
3+
<fieldset>
4+
<legend>Register</legend>
55
<label class="control-label" for="username">Username</label>
66
<input type="text" name="username" value="" id="username" size="30" class="required" />
7-
</div>
8-
<div class="controls">
97
<label class="control-label" for="password">Password</label>
108
<input type="password" name="password" value="" id="password" size="30" class="required" />
11-
</div>
12-
<div class="controls">
139
<label class="control-label" for="confirm_password">Confirm Password</label>
1410
<input type="password" name="confirm_password" value="" id="confirm_password" size="30" class="required" />
15-
</div>
16-
<div class="controls">
1711
<label class="control-label" for="email">Email Address</label>
18-
<input type="text" name="email" value="" id="email" maxlength="80" size="30" class="required email" />
19-
</div>
20-
<div class="controls">
12+
<input type="text" name="email" value="" id="email" maxlength="80" size="30" class="required email" /><br/>
2113
<input type="submit" name="register" value="Register" class="btn" />
22-
</div>
14+
</fieldset>
2315
</form>
24-
</fieldset>
16+
</div>
Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
<script language="text/javascript" type="text/javascript" src="{$base_url}scripts/modules/home/contact.js"></script>
2-
<div id="content">
3-
</br>
4-
<div class="span-24 last" id="error">
2+
3+
<div class="span4" id="error">
54
<form name="contact" method="post" action="{$base_url}home/contact" id="contact" class="well">
6-
<div>
7-
<label class="control-label" for="name">{$contact_form.name.label} :</label><br />
8-
<input type="text" name="{$contact_form.name.field}" id="name" class="required">
9-
</div>
10-
<div>
11-
<label class="control-label" for="email">{$contact_form.email.label} :</label><br />
12-
<input type="text" name="{$contact_form.email.field}" id="email" class="required email">
13-
</div>
14-
<div>
15-
<label class="control-label" for="subject">{$contact_form.subject.label} :</label><br />
16-
<input type="text" name="{$contact_form.subject.field}" id="subject" class="required">
17-
</div>
18-
<div>
19-
<label class="control-label" for="message">{$contact_form.message.label} :</label><br />
20-
<textarea name="{$contact_form.message.field}" id="message" cols="45" rows="3" class="required"></textarea>
21-
</div>
22-
<input type="submit" name="submit" id="submit" value="Submit" class="btn">
5+
<fieldset>
6+
<legend>Contact</legend>
7+
<label class="control-label" for="name">{$contact_form.name.label} :</label>
8+
<input type="text" name="{$contact_form.name.field}" id="name" class="required">
9+
10+
<label class="control-label" for="email">{$contact_form.email.label} :</label>
11+
<input type="text" name="{$contact_form.email.field}" id="email" class="required email">
12+
13+
<label class="control-label" for="subject">{$contact_form.subject.label} :</label>
14+
<input type="text" name="{$contact_form.subject.field}" id="subject" class="required">
15+
16+
<label class="control-label" for="message">{$contact_form.message.label} :</label>
17+
<textarea name="{$contact_form.message.field}" id="message" cols="45" rows="3" class="required"></textarea>
18+
19+
<input type="submit" name="submit" id="submit" value="Submit" class="btn">
20+
</fieldset>
2321
</form>
2422
</div>
25-
</div>
23+

0 commit comments

Comments
 (0)