Skip to content

Commit

Permalink
Bootstrap styling for login page
Browse files Browse the repository at this point in the history
Removed mobile login page as the new login page is responsive.
  • Loading branch information
dpaquette committed Jan 25, 2015
1 parent 9dc3c6f commit 3ee4a12
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 283 deletions.
8 changes: 0 additions & 8 deletions src/BugTracker.Web/BugTracker.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,6 @@
<Content Include="mbug.aspx" />
<Content Include="mbugs.aspx" />
<Content Include="merge_bug.aspx" />
<Content Include="mlogin.aspx" />
<Content Include="notifications.aspx" />
<Content Include="orgs.aspx" />
<Content Include="paste_plain.png" />
Expand Down Expand Up @@ -1230,13 +1229,6 @@
<Compile Include="merge_bug.aspx.designer.cs">
<DependentUpon>merge_bug.aspx</DependentUpon>
</Compile>
<Compile Include="mlogin.aspx.cs">
<DependentUpon>mlogin.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="mlogin.aspx.designer.cs">
<DependentUpon>mlogin.aspx</DependentUpon>
</Compile>
<Compile Include="notifications.aspx.cs">
<DependentUpon>notifications.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
Expand Down
15 changes: 15 additions & 0 deletions src/BugTracker.Web/LoggedOut.Master
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,21 @@
<div class="container" style="margin-top: 40px">
<asp:ContentPlaceHolder runat="server" ID="body"></asp:ContentPlaceHolder>
</div>
<footer class="page-footer">
<div class="container">
<ul class="text-muted">
<li>BugTracker.NET</li>
<li>·</li>
<li><a target="_blank" href="http://ifdefined.com/README.html">Help</a></li>
<li>·</li>
<li><a target="_blank" href="mailto:ctrager@yahoo.com">Feedback</a></li>
<li>·</li>
<li><a target="_blank" href="about.html">About</a></li>
<li>·</li>
<li><a target="_blank" href="http://ifdefined.com/README.html">Donate</a></li>
</ul>
</div>
</footer>
<script src="Scripts/bootstrap.min.js"></script>
</body>

Expand Down
2 changes: 1 addition & 1 deletion src/BugTracker.Web/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
users EXCEPT that even if you give the guest user permissions beyond View Only and Reporter,
the system will automatically reduce his permissions downward.
-->
<add key="AllowGuestWithoutLogin" value="1"/>
<add key="AllowGuestWithoutLogin" value="0"/>
<!--
If you have windows security turned on, and if you set
EnableWindowsUserAutoRegistration to "1", then windows users will be
Expand Down
28 changes: 28 additions & 0 deletions src/BugTracker.Web/btnet_base.css
Original file line number Diff line number Diff line change
Expand Up @@ -451,3 +451,31 @@ margin-bottom:0pt;
/* for Lucene, highlighting the search terms */
.highlighted {background:yellow;}


.profile-img {
width: 96px;
height: 96px;
margin: 0 auto 10px;
display: block;
color: #00cc00;
background-color: #f0fff0;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
border-radius: 50%;
text-align: center;
font-size: 4em;
}

.profile-img i{
vertical-align: bottom;
}

.page-footer {
border-top: 1px solid #aaaaaa;
text-align: center;
}

.page-footer li {
display: inline;
}

138 changes: 63 additions & 75 deletions src/BugTracker.Web/default.aspx
Original file line number Diff line number Diff line change
@@ -1,96 +1,84 @@
<%@ Page Language="C#" ValidateRequest="false" CodeBehind="default.aspx.cs" Inherits="btnet.default" AutoEventWireup="True" MasterPageFile="LoggedOut.Master" %>

<%@ Import Namespace="btnet" %>

<asp:Content runat="server" ContentPlaceHolderID="body">
<div style="float: right;">
<span>
<a target="_blank" style="font-size: 7pt; font-family: arial; letter-spacing: 1px;" href="http://ifdefined.com/bugtrackernet.html">BugTracker.NET</a>
<br>
<a target="_blank" style="font-size: 7pt; font-family: arial; letter-spacing: 1px;" href="http://ifdefined.com/README.html">Help</a>
<br>
<a target="_blank" style="font-size: 7pt; font-family: arial; letter-spacing: 1px;" href="mailto:ctrager@yahoo.com">Feedback</a>
<br>
<a target="_blank" style="font-size: 7pt; font-family: arial; letter-spacing: 1px;" href="about.html">About</a>
<br>
<a target="_blank" style="font-size: 7pt; font-family: arial; letter-spacing: 1px;" href="http://ifdefined.com/README.html">Donate</a>
</span>
</div>

<div align="center">
<table border="0">
<tr>
<td>
<form class="frm" runat="server">
<table border="0">

<% if (Util.get_setting("WindowsAuthentication", "0") != "0")
{ %>
<tr>
<td colspan="2" class="smallnote">To login using your Windows ID, leave User blank</td>
</tr>
<% } %>
<tr>
<td class="lbl">User:</td>
<td>
<input runat="server" type="text" class="txt" id="user"/></td>
</tr>

<tr>
<td class="lbl">Password:</td>
<td>
<input runat="server" type="password" class="txt" id="pw"/></td>
</tr>
<div class="row">
<div class="col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">
<div class="panel panel-default">

<tr>
<td colspan="2" align="left">
<span runat="server" class="err" id="msg">&nbsp;</span>
</td>
</tr>
<div class="panel-body">
<form role="form" method="POST" runat="server">
<fieldset>
<div class="row">
<div class="center-block">
<div class="profile-img">
<i class="glyphicon glyphicon-user"></i>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12 col-md-10 col-md-offset-1 ">
<div class="form-group">
<div class="input-group">
<span class="input-group-addon">
<i class="glyphicon glyphicon-user"></i>
</span>
<input runat="server" type="text" class="form-control" placeholder="Username" id="user" autofocus />

<tr>
<td colspan="2" align="center">
<input class="btn" type="submit" value="Logon" runat="server"/>
</td>
</tr>
</div>
</div>
<div class="form-group">
<div class="input-group">
<span class="input-group-addon">
<i class="glyphicon glyphicon-lock"></i>
</span>
<input runat="server" type="password" class="form-control" placeholder="Password" id="pw" />
</div>
</div>
<div class="form-group">
<input type="submit" class="btn btn-lg btn-primary btn-block" value="Sign in">
<span runat="server" class="err" id="msg">&nbsp;</span>

</table>
</div>
</div>
</div>
</fieldset>
</form>
</div>
<div class="panel-footer text-muted">
<% if (Util.get_setting("AllowGuestWithoutLogin", "0") == "1")
{ %>
<div>Continue as <a href="bugs.aspx">guest</a></div>

<span>
<% } %>

<% if (Util.get_setting("AllowGuestWithoutLogin", "0") == "1")
{ %>
<p>
<a style="font-size: 8pt;" href="bugs.aspx">Continue as "guest" without logging in</a>
<p>
<% } %>
<% if (Util.get_setting("AllowSelfRegistration", "0") == "1")
{ %>
<div>Don't have an account? <a href="register.aspx">Register Here</a></div>

<% if (Util.get_setting("AllowSelfRegistration", "0") == "1")
{ %>
<p>
<a style="font-size: 8pt;" href="register.aspx">Register</a>
<p>
<% } %>
<% } %>

<% if (Util.get_setting("ShowForgotPasswordLink", "1") == "1")
{ %>
<p>
<a style="font-size: 8pt;" href="forgot.aspx">Forgot your username or password?</a>
<p>
<% } %>
</span>

</td>
</tr>
</table>

<% Response.Write(Application["custom_welcome"]); %>
<% if (Util.get_setting("ShowForgotPasswordLink", "1") == "1")
{ %>
<div><a href="forgot.aspx">Forgot password?</a></div>
<% } %>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6 col-md-4 col-md-offset-4">
<% Response.Write(Application["custom_welcome"]); %>
</div>
</div>
</div>

</asp:Content>
<asp:Content runat="server" ContentPlaceHolderID="footerScripts">
<script>
$(function () {
$("<%=user.ClientID%>").focus();
});
</script>
</asp:Content>
</asp:Content>
109 changes: 0 additions & 109 deletions src/BugTracker.Web/mlogin.aspx

This file was deleted.

12 changes: 0 additions & 12 deletions src/BugTracker.Web/mlogin.aspx.cs

This file was deleted.

Loading

0 comments on commit 3ee4a12

Please sign in to comment.