Merge branch 'design_team' into ldap

This commit is contained in:
Christophe Vilayphiou 2012-05-09 15:25:16 +08:00
commit dc9af65524
1 changed files with 1 additions and 1 deletions

View File

@ -16,7 +16,7 @@
</div> </div>
<ul class="nav"> <ul class="nav">
<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li> <li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>
<li><a class="orbit-bar-desktop" href="#">Desktop</a></li> <li><a class="orbit-bar-desktop" href="https://i.nccu.edu.tw/Login.aspx?ReturnUrl=/Default.aspx" target="_blank">Desktop</a></li>
</ul> </ul>
<ul class="nav pull-right"> <ul class="nav pull-right">
<li class="dropdown language"> <li class="dropdown language">