Skip to content

Commit

Permalink
Styling of Bugs toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@dpaquette
dpaquette committed Jan 27, 2015
1 parent f03caa8 commit ec66402
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 114 deletions.
4 changes: 3 additions & 1 deletion src/BugTracker.Web/LoggedIn.Master
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
</head>
<body>
<uc1:MainMenu runat="server" ID="MainMenu" />
<asp:ContentPlaceHolder runat="server" ID="body"></asp:ContentPlaceHolder>
<div class="container-fluid">
<asp:ContentPlaceHolder runat="server" ID="body"></asp:ContentPlaceHolder>
</div>
<uc1:Footer runat="server" ID="Footer" />
<script src="Scripts/bootstrap.min.js"></script>
</body>
Expand Down
5 changes: 2 additions & 3 deletions src/BugTracker.Web/btnet/bug_list.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,9 @@ string filter_val

string bug_count_string = get_buglist_bug_count_string(dv);

Response.Write("<table border=0 cellpadding=0 cellspacing=0 width=100%><tr><td align=left valign=top>");

Response.Write(paging_string);
Response.Write("<td align=right valign=top><span class=smallnote>clicking while holding Ctrl key toggles \"NOT\" in a filter: \"NOT project 1\"</span></table>");
Response.Write("\n<table class=bugt border=1 ><tr>\n");
Response.Write("\n<table class=\"bugt\" ><tr>\n");

///////////////////////////////////////////////////////////////////
// headings
Expand Down
41 changes: 1 addition & 40 deletions src/BugTracker.Web/btnet_base.css
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
body {
font-family: verdana, arial;
font-size: 10pt;
background: #ffffff;
}

td {
font-size: 8pt;
}

p {
font-size: 10pt;
}

a {color:#0000ff; font-size: 10pt; text-decoration: none; }
a:visited {color:#0000ff; font-size: 10pt; text-decoration: none; }
a:hover {color:#ff6633; font-size: 10pt; text-decoration: none; }


a.external-link {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABmJLR0QA/wD/AP+gvaeTAAAAB3RJTUUH2wEbDi8zqQfLEwAAAOhJREFUKJGlkD1LQmEYhq9XT4giFC6tboE69hviRHuDoCDiyVWkf9AcVFDQ0CF0zNnBQZw0sE0HB6O/EPRBBN4Oh6S310W6t+fjerjvBzaUcTp1ZVnQB7LO7Na4+9TUL93JEYEEEHOAOJXWiPfDS3j7cu95AARjrTqLKcbscZDzSCciKJ34iwVjSdLoWdptSvfDyMZ5T/IvbEveD/P6CUdXcF2E431oP0Lz4Rtp66MckgJeLGA7Ce0q3Ayi+rQD0gxihXxrSEicimNJkroTKdOI7FnZrNC/5OdhfgY7KfdDFmBOntZv/FdLo+R3CdfXTq4AAAAASUVORK5CYII=') /*Content/images/ExternalLink.png*/;
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjwhLS0gQ3JlYXRlZCB3aXRoIElua3NjYXBlIChodHRwOi8vd3d3Lmlua3NjYXBlLm9yZy8pIC0tPgo8c3ZnCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4wIgogICB3aWR0aD0iMTIiCiAgIGhlaWdodD0iMTIiCiAgIGlkPSJzdmcyIj4KICA8ZGVmcwogICAgIGlkPSJkZWZzNCIgLz4KICA8cmVjdAogICAgIHdpZHRoPSI1Ljk5OTk5OTUiCiAgICAgaGVpZ2h0PSI2IgogICAgIHg9IjEuNSIKICAgICB5PSI0LjUiCiAgICAgaWQ9InJlY3QzMTcwIgogICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOm5vbnplcm87c3Ryb2tlOiMwMDY2Y2M7c3Ryb2tlLXdpZHRoOjAuOTk5OTk5OTQ7c3Ryb2tlLWxpbmVjYXA6YnV0dDtzdHJva2UtbGluZWpvaW46bWl0ZXI7c3Ryb2tlLW1pdGVybGltaXQ6NDtzdHJva2UtZGFzaGFycmF5Om5vbmU7c3Ryb2tlLWRhc2hvZmZzZXQ6MDtzdHJva2Utb3BhY2l0eToxIiAvPgogIDxwYXRoCiAgICAgZD0iTSA0LDIuNSBMIDUsMy41IEwgNS4yNSw0LjI1IEwgMi43NSw2LjUgTCA1LjUsOS4yNSBMIDcuNzUsNi43NSBMIDguNSw3IEwgOS41LDggTCAxMSw2LjUgTCAxMSwxIEwgNS41LDEgTCA0LDIuNSB6IgogICAgIGlkPSJwYXRoMjM5NSIKICAgICBzdHlsZT0iZmlsbDojMDA2NmZmO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpldmVub2RkO3N0cm9rZTpub25lO3N0cm9rZS13aWR0aDoxcHg7c3Ryb2tlLWxpbmVjYXA6YnV0dDtzdHJva2UtbGluZWpvaW46bWl0ZXI7c3Ryb2tlLW9wYWNpdHk6MSIgLz4KICA8cGF0aAogICAgIGQ9Ik0gNiwyIEwgMTAsMiBMIDEwLDYgTCA5LjUsNi43NSBMIDguMjUsNC43NSBMIDUuMjUsOCBMIDQsNi43NSBMIDcuMjUsMy43NSBMIDUuMjUsMi41IEwgNiwyIHoiCiAgICAgaWQ9InBhdGgyMzk4IgogICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7ZmlsbC1ydWxlOmV2ZW5vZGQ7c3Ryb2tlOm5vbmU7c3Ryb2tlLXdpZHRoOjFweDtzdHJva2UtbGluZWNhcDpidXR0O3N0cm9rZS1saW5lam9pbjptaXRlcjtzdHJva2Utb3BhY2l0eToxIiAvPgo8L3N2Zz4K') /*Content/images/ExternalLink.svg*/, none;
Expand All @@ -29,11 +10,7 @@ a.external-link {
/* bug tables */

.bugt {
border-collapse: collapse;
border-width: 1px;
border-style: solid;
border-color: #aaaaaa;
padding: 3px;
width: 100%;
}

/* bug table headers */
Expand Down Expand Up @@ -106,12 +83,6 @@ a.external-link {
font-weight: bold;
}

.btn {
background: #ffeeaa;
color: #0000ff;
}


.cmt {
background:white;
border: 1px #009900 solid;
Expand Down Expand Up @@ -258,16 +229,6 @@ a.external-link {
letter-spacing: 3px;
}


select {
font-size: 8pt;
border: 1px solid #cccccc;
}

option {
font-size: 8pt;
}

.edit_bug_option {
font-size: 8pt;
font-weight: bold;
Expand Down
151 changes: 81 additions & 70 deletions src/BugTracker.Web/bugs.aspx
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,113 @@
<%@ Page Language="C#" CodeBehind="bugs.aspx.cs" Inherits="btnet.bugs" AutoEventWireup="True" MasterPageFile="~/LoggedIn.Master" %>

<%@ MasterType TypeName="btnet.LoggedIn" %>

<%@ Import Namespace="System.Data" %>
<%@ Import Namespace="btnet" %>
<%@ Import Namespace="btnet.Security" %>


<asp:Content ContentPlaceHolderID="headerScripts" runat="server">
<!--
Copyright 2002-2011 Corey Trager
Distributed under the terms of the GNU General Public License
-->

<script type="text/javascript" src="bug_list.js"></script>

<script type="text/javascript" language="JavaScript" src="bug_list.js"></script>
<script>
<script>
$(document).ready(function() {
$('.filter').click(on_invert_filter)
$('.filter_selected').click(on_invert_filter)
})
$(document).ready(function() {
$('.filter').click(on_invert_filter);
$('.filter_selected').click(on_invert_filter);
});
function on_query_changed()
{
var frm = document.getElementById(asp_form_id);
frm.actn.value = "query";
var action = document.getElementById("<%=actn.ClientID%>");
$(action).val("query");
var frm = document.getElementById("<%=frm.ClientID%>");
frm.submit();
}
</script>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">



<form method="POST" runat="server">

<div class="align">

<table border="0">
<tr>
<td nowrap>
<% if (User.Identity.GetCanAddBugs())
{ %>
<a href="edit_bug.aspx">
<img src="add.png" border="0" align="top">&nbsp;add new <% Response.Write(Util.get_setting("SingularBugLabel", "bug")); %></a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

<% } %>

<td nowrap>
<asp:DropDownList ID="query" runat="server" onchange="on_query_changed()">
</asp:DropDownList>

<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="print_bugs.aspx">print list</a>
<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="print_bugs2.aspx">print detail</a>
<td nowrap>&nbsp;&nbsp;&nbsp;&nbsp;<a target="_blank" href="print_bugs.aspx?format=excel">export to excel</a>
<td nowrap align="right" width="100%">
<a target="_blank" href="btnet_screen_capture.exe">
<img src="camera.png" border="0" align="top">&nbsp;download screen capture utility</a>
</table>
<br>
<%
if (dv != null)
{
if (dv.Table.Rows.Count > 0)
<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>
<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 />



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

<%
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>");
}
%>
<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>
Response.Write("<div class=err>Error in query SQL: " + sql_error + "</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>
</asp:Content>

Expand Down
9 changes: 9 additions & 0 deletions src/BugTracker.Web/bugs.aspx.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ec66402

Please sign in to comment.