Skip to content

Fixed #44 ：登录和注册按钮的形式 #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjtufs wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Fixed #44 ：登录和注册按钮的形式 #49

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c226b84
初步翻译
sjtufs Oct 15, 2012
eb0a822
fix typo
sjtufs Oct 17, 2012
d6dc9ef
change alert message
sjtufs Oct 17, 2012
db16b1c
change alert message
sjtufs Oct 17, 2012
77fb815
mode translation in DashboardController
sjtufs Oct 18, 2012
dc35883
replacement of translate
sjtufs Oct 18, 2012
3ce7bc9
Dashboard controller finished
sjtufs Oct 18, 2012
8c083d7
修改缩进
sjtufs Oct 20, 2012
dbaabbf
flourish 剩余fUnexpectedException没处理
sjtufs Oct 22, 2012
60e500b
fix average total score in report
sjtufs Oct 27, 2012
6e73e0e
Fixed #39 : 在已经完成的report界面不进行自动刷新
sjtufs Nov 10, 2012
7bd63b1
Fixed # 37 : 在题目中添加提交记录按钮
sjtufs Nov 16, 2012
1efc303
Merge remote branch 'upstream/master'
sjtufs Dec 25, 2012
ac76795
modify login/register button
sjtufs Dec 25, 2012
1ff08db
replace buttons in login page
sjtufs Dec 25, 2012
804acc6
fixed #44
sjtufs Dec 31, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions app/views/layout/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="description" content="<?php echo $meta_description; ?>">
<?php endif; ?>
<?php if (isset($meta_author)): ?>
<meta name="author" content="<?php echo $meta_author; ?>">
<meta name="author" content="root">
<?php endif; ?>
<link href="<?php echo ASSET_CSS; ?>/css/bootstrap.min.css" rel="stylesheet">
<style> body { padding-top: 60px; } </style>
Expand Down Expand Up @@ -52,12 +52,25 @@
<time>服务器时间：<?php echo new fTimestamp(); ?></time>
</div>
<?php else: ?>
<form action="<?php echo SITE_BASE; ?>/login" method="POST" class="form-inline pull-right" style="margin: 0">
<input type="text" class="input-small" placeholder="用户名" name="username" maxlength="80">
<input type="password" class="input-small" placeholder="密码" name="password" maxlength="80">
<input type="submit" class="btn btn-primary" name="action" value="登录"><?php
?><a class="btn btn-success" href="<?php echo SITE_BASE; ?>/login">注册</a>
<div class="btn-group nav pull-right">
<a href="<?php echo SITE_BASE; ?>/login" class="btn btn-large" name="action" value="注册"><i class="icon-plus"></i>注册</button>
<a class="btn dropdown-toggle btn-middle" data-toggle="dropdown" href="#"><i class="icon-user"></i>
登录
</a>
<ul class="dropdown-menu">
<form action="<?php echo SITE_BASE; ?>/login" method="POST" class="form-inline " style="margin: 0">
<fieldset class='textbox' style="padding:10px">
<p>用户名</p>
<input style="margin-top: 8px" type="text" class="input-small" placeholder="用户名" name="username" maxlength="80">
<p>密码</p>
<input style="margin-top: 8px" type="password" class="input-small" placeholder="密码" name="password" maxlength="80">
<hr>
<button type="submit" class="btn btn-middle btn-primary" name="action" value="登录"><i class="icon-user icon-white"></i>登录</button><?php
?>
</fieldset>
</form>
</ul>
</div>
<?php endif; ?>
<div class="nav-collapse">
<ul class="nav">
Expand Down