Skip to content

Commit

Permalink
Can't force container-fluid on all logged in pages
Browse files Browse the repository at this point in the history 
Will have to define container type for each individual page
  • Loading branch information
@dpaquette
dpaquette committed Jan 29, 2015
1 parent a749224 commit c5dd87c
Show file tree
Hide file tree
Showing 3 changed files with 298 additions and 298 deletions.
4 changes: 1 addition & 3 deletions src/BugTracker.Web/LoggedIn.Master
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
</head>
<body>
<uc1:MainMenu runat="server" ID="MainMenu" />
<div class="container-fluid">
<asp:ContentPlaceHolder runat="server" ID="body"></asp:ContentPlaceHolder>
</div>
<asp:ContentPlaceHolder runat="server" ID="body"></asp:ContentPlaceHolder>
<uc1:Footer runat="server" ID="Footer" />
<script src="Scripts/bootstrap.min.js"></script>
</body>
Expand Down
132 changes: 67 additions & 65 deletions src/BugTracker.Web/bugs.aspx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,86 +29,88 @@
</script>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<div class="container-fluid">

<form method="POST" runat="server" id="frm">
<div class="row">
<div class="col-md-12">
<label>Query</label>
</div>
</div>
<div class="row">
<div class="col-md-4 col-sm-6 col-xs-12">
<asp:DropDownList ID="query" runat="server" class="form-control" onchange="on_query_changed()">
</asp:DropDownList>
<form method="POST" runat="server" id="frm">
<div class="row">
<div class="col-md-12">
<label>Query</label>
</div>
</div>
<div class="row">
<div class="col-md-4 col-sm-6 col-xs-12">
<asp:DropDownList ID="query" runat="server" class="form-control" onchange="on_query_changed()">
</asp:DropDownList>
</div>

</div>
<br />
<div class="row">
<div class="col-md-12">
<% if (User.Identity.GetCanAddBugs())
{ %>
<a href="edit_bug.aspx" class="btn btn-primary"><span class="glyphicon glyphicon-plus"></span>&nbsp;New <%=Util.get_setting("SingularBugLabel", "bug")%></a>

<% } %>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="glyphicon glyphicon-print"></span>&nbsp;Print<span class="caret"></span>
</button>


<ul class="dropdown-menu" role="menu">
<li><a target="_blank" href="print_bugs.aspx">List</a></li>
<li><a target="_blank" href="print_bugs2.aspx">Details</a></li>
</ul>
</div>
<br />
<div class="row">
<div class="col-md-12">
<% if (User.Identity.GetCanAddBugs())
{ %>
<a href="edit_bug.aspx" class="btn btn-primary"><span class="glyphicon glyphicon-plus"></span>&nbsp;New <%=Util.get_setting("SingularBugLabel", "bug")%></a>

<% } %>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="glyphicon glyphicon-print"></span>&nbsp;Print<span class="caret"></span>
</button>


<ul class="dropdown-menu" role="menu">
<li><a target="_blank" href="print_bugs.aspx">List</a></li>
<li><a target="_blank" href="print_bugs2.aspx">Details</a></li>
</ul>
</div>
<a target="_blank" class="btn btn-default" href="print_bugs.aspx?format=excel"><span class="glyphicon glyphicon-download"></span>&nbsp;Export to Excel</a>
<a target="_blank" class="btn btn-default pull-right" href="btnet_screen_capture.exe" title="Download Screen Capture Utility">
<span class="glyphicon glyphicon-camera"></span>&nbsp;Screen Capture Tool</a>
</div>
<a target="_blank" class="btn btn-default" href="print_bugs.aspx?format=excel"><span class="glyphicon glyphicon-download"></span>&nbsp;Export to Excel</a>
<a target="_blank" class="btn btn-default pull-right" href="btnet_screen_capture.exe" title="Download Screen Capture Utility">
<span class="glyphicon glyphicon-camera"></span>&nbsp;Screen Capture Tool</a>
</div>
</div>
<br />

<br />



<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-12">

<%
if (dv != null)
{
if (dv.Table.Rows.Count > 0)
<%
if (dv != null)
{
if (btnet.Util.get_setting("EnableTags", "0") == "1")
if (dv.Table.Rows.Count > 0)
{
btnet.BugList.display_buglist_tags_line(Response, User.Identity);
if (btnet.Util.get_setting("EnableTags", "0") == "1")
{
btnet.BugList.display_buglist_tags_line(Response, User.Identity);
}
display_bugs(false);
}
else
{
Response.Write("<p>No ");
Response.Write(Util.get_setting("PluralBugLabel", "bugs"));
Response.Write(" yet.<p>");
}
display_bugs(false);
}
else
{
Response.Write("<p>No ");
Response.Write(Util.get_setting("PluralBugLabel", "bugs"));
Response.Write(" yet.<p>");
}
}
else
{
Response.Write("<div class=err>Error in query SQL: " + sql_error + "</div>");
}%>
Response.Write("<div class=err>Error in query SQL: " + sql_error + "</div>");
}%>
</div>
</div>
</div>
<input type="hidden" name="new_page" id="new_page" runat="server" value="0" />
<input type="hidden" name="actn" id="actn" runat="server" value="" />
<input type="hidden" name="filter" id="filter" runat="server" value="" />
<input type="hidden" name="sort" id="sort" runat="server" value="-1" />
<input type="hidden" name="prev_sort" id="prev_sort" runat="server" value="-1" />
<input type="hidden" name="prev_dir" id="prev_dir" runat="server" value="ASC" />
<input type="hidden" name="tags" id="tags" value="" />


<div id="popup" class="buglist_popup"></div>
</form>
<input type="hidden" name="new_page" id="new_page" runat="server" value="0" />
<input type="hidden" name="actn" id="actn" runat="server" value="" />
<input type="hidden" name="filter" id="filter" runat="server" value="" />
<input type="hidden" name="sort" id="sort" runat="server" value="-1" />
<input type="hidden" name="prev_sort" id="prev_sort" runat="server" value="-1" />
<input type="hidden" name="prev_dir" id="prev_dir" runat="server" value="ASC" />
<input type="hidden" name="tags" id="tags" value="" />


<div id="popup" class="buglist_popup"></div>
</form>
</div>
</asp:Content>

<asp:Content ContentPlaceHolderID="footerScripts" runat="server">
Expand Down
Loading

0 comments on commit c5dd87c

Please sign in to comment.