Skip to content

Commit

Permalink
Fixed view exceptions for release mode - really this time :)
Browse files Browse the repository at this point in the history
Fixes #492, resolves #480, closes #411.
Removed extra-spaces from views.
  • Loading branch information
bonesoul committed Sep 29, 2014
1 parent 6ae9455 commit f5e4c67
Show file tree
Hide file tree
Showing 16 changed files with 181 additions and 164 deletions.
50 changes: 36 additions & 14 deletions src/CoiniumServ/CoiniumServ.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,9 @@
<None Include="config\software-example.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\algorithm\algorithm.cshtml" />
<None Include="web\default\views\algorithm\algorithm.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
Expand Down Expand Up @@ -738,7 +740,9 @@
<Compile Include="Persistance\Layers\Mpos\MposStorage.Miners.cs" />
<Compile Include="Persistance\Layers\Mpos\MposStorage.Statistics.cs" />
<None Include="web.config" />
<None Include="web\default\views\algorithms\algorithms.cshtml" />
<None Include="web\default\views\algorithms\algorithms.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\api\api.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -778,10 +782,18 @@
<None Include="web\default\Content\fonts\ionicons.woff">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\help\gettingstarted\index.cshtml" />
<None Include="web\default\views\help\gettingstarted\pool.cshtml" />
<None Include="web\default\views\help\miningsoftware\index.cshtml" />
<None Include="web\default\views\layout\header.cshtml" />
<None Include="web\default\views\help\gettingstarted\index.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\help\gettingstarted\pool.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\help\miningsoftware\index.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\layout\header.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\layout\footer.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -896,17 +908,30 @@
<None Include="web\default\Content\less\vars.less">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\layout\main.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\layout\navbar.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\layout\sidebar.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\partial\algorithms.cshtml" />
<None Include="web\default\views\partial\pools.cshtml" />
<None Include="web\default\views\pools\pools.cshtml" />
<None Include="web\default\views\pool\block.cshtml" />
<None Include="web\default\views\pool\blocks.cshtml" />
<None Include="web\default\views\partial\algorithms.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\partial\pools.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\pools\pools.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\pool\block.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\pool\blocks.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\pool\pool.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -3410,9 +3435,6 @@
<None Include="web\default\Content\js\plugins\timepicker\bootstrap-timepicker.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\views\layout\main.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="web\default\Content\favicon.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
8 changes: 4 additions & 4 deletions src/CoiniumServ/web/default/views/api/api.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<td>none</td>
<td><strong>Pools List & Statistics</strong><br><small>Returns list of pools and detailed statistics for them.</small></td>
<td>
<a href="/api/pools/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
<a href="/api/pools/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
</td>
</tr>
<tr>
Expand All @@ -42,7 +42,7 @@
<td>
@if (@Model.Coin != null)
{
<a href="/api/pool/@Model.Coin.Symbol/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
<a href="/api/pool/@Model.Coin.Symbol/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
}
</td>
</tr>
Expand All @@ -51,7 +51,7 @@
<td>none</td>
<td><strong>Algorithms List & Statistics</strong><br><small>Returns list of algorithms and detailed statistics for them.</small></td>
<td>
<a href="/api/algorithms/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
<a href="/api/algorithms/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
</td>
</tr>
<tr>
Expand All @@ -61,7 +61,7 @@
<td>
@if (@Model.Coin != null)
{
<a href="/api/algorithm/@Model.Coin.Algorithm/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
<a href="/api/algorithm/@Model.Coin.Algorithm/" title="Raw view" target="_blank" class="btn btn-default"><i class="fa fa-eye"></i></a>
}
</td>
</tr>
Expand Down
22 changes: 11 additions & 11 deletions src/CoiniumServ/web/default/views/donate/donate.cshtml
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
@{ Layout = "layout/main.cshtml"; }

<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<div class="box box-solid box-primary">
<div class="box-header">
<h3 class="box-title"><i class="fa fa-money"></i> Donate CoiniumServ</h3>
</div>
<div class="box-body no-padding">
<div class="box-body no-padding">
<div class="callout callout-info">
<p>
<a href="http://www.coiniumserv.com" target="_blank">
<img src="/Content/img/CoiniumServ.png" style="width: 16px; height: 16px; border: 0px;">
<strong>CoiniumServ</strong>
</a>
is an open-source & community-driven project aiming to develop next-gen crypto-currency pooled mining server software.
If you like the software, you can support the project by donating.
If you like the software, you can support the project by donating.
</p>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="col-md-6">
<div class="box box-solid box-danger">
<div class="box-header">
<h3 class="box-title"><i class="fa fa-bitcoin"></i> Directly send crypto currencies</h3>
</div>
<div class="box-body">
You can directly donate to our following addresses;<br/><br/>
You can directly donate to our following addresses;<br /><br />
<ul>
<li>Bitcoin: <a href="bitcoin:18qqrtR4xHujLKf9oqiCsjmwmH5vGpch4D?label=CoiniumServ%20Donation"><code>18qqrtR4xHujLKf9oqiCsjmwmH5vGpch4D</code></a></li>
<li>Litecoin: <a href="litecoin:LMXfRb3w8cMUBfqZb6RUkFTPaT6vbRozPa?label=CoiniumServ%20Donation"><code>LMXfRb3w8cMUBfqZb6RUkFTPaT6vbRozPa</code></a></li>
<li>Dogecoin: <a href="dogecoin:DM8FW8REMHj3P4xtcMWDn33ccjikCWJnQr?label=CoiniumServ%20Donation"><code>DM8FW8REMHj3P4xtcMWDn33ccjikCWJnQr</code></a></li>
<li>Reddcoin: <a href="reddcoin:Rb9kcLs96VDHTmiXVjcWC2RBsfCJ73UQyr?label=CoiniumServ%20Donation"><code>Rb9kcLs96VDHTmiXVjcWC2RBsfCJ73UQyr</code></a></li>
</ul>
</ul>
</div>
</div>
</div>
Expand All @@ -46,9 +46,9 @@
You can also support the development of the project with different over these services;<br /><br />
<a class="coinbase-button" data-code="cf6bb9334d09f07ad3abbe5894702ae9" data-button-style="custom_small" href="https://coinbase.com/checkouts/cf6bb9334d09f07ad3abbe5894702ae9">Donate Bitcoins</a>
<script src="https://coinbase.com/assets/button.js" type="text/javascript"></script>
<br/>
<a href="https://www.bountysource.com/trackers/401667-coiniumserv?utm_source=401667&utm_medium=shield&utm_campaign=TRACKER_BADGE" target="_blank"><img src="https://www.bountysource.com/badge/tracker?tracker_id=401667" alt="Donate using BountySource"/></a><br/>
<a href="https://tip4commit.com/github/CoiniumServ/CoiniumServ" target="_blank"><img src="https://tip4commit.com/projects/760.svg" alt="Tip using tip4commit"/></a><br />
<br />
<a href="https://www.bountysource.com/trackers/401667-coiniumserv?utm_source=401667&utm_medium=shield&utm_campaign=TRACKER_BADGE" target="_blank"><img src="https://www.bountysource.com/badge/tracker?tracker_id=401667" alt="Donate using BountySource" /></a><br />
<a href="https://tip4commit.com/github/CoiniumServ/CoiniumServ" target="_blank"><img src="https://tip4commit.com/projects/760.svg" alt="Tip using tip4commit" /></a><br />
<a href="https://gratipay.com/on/github/CoiniumServ" target="_blank"><img src="http://img.shields.io/badge/gratipay-donate-brightgreen.svg" alt="Tip using GratiPay" /></a><br />
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</tbody>
</table>

<br />You have to also set the port in your miner configuration;<br/><br/>
<br />You have to also set the port in your miner configuration;<br /><br />
<table class="table table-striped">
<tbody>
<tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</tr>
}
</tbody>
</table>
</table>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="box box-solid box-primary">
<div class="box-header">
<h3 class="box-title"><i class="fa fa-paperclip"></i> Terms of Service</h3>
</div>
</div>
<div class="box-body">
<div class="callout callout-warning">
<h4>This Agreement governs your use of <strong>@ViewBag.StackName</strong> pools & website.</h4>
Expand Down
6 changes: 4 additions & 2 deletions src/CoiniumServ/web/default/views/layout/footer.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
IMPORTANT: YOU ARE NOT ALLOWED TO REMOVE following license & copyright text!
If you would like to do so, check our white-labeling solutions: http://www.coiniumserv.com/shop/services/white-labeling/
-->
Proudly powered by <a href="http://www.coiniumserv.com" target="_blank"><img src="/Content/img/CoiniumServ.png" style="width: 16px; height: 16px; border: 0px;"/>
<strong>CoiniumServ</strong></a>.
Proudly powered by <a href="http://www.coiniumserv.com" target="_blank">
<img src="/Content/img/CoiniumServ.png" style="width: 16px; height: 16px; border: 0px;" />
<strong>CoiniumServ</strong>
</a>.

Data last updated @@ @ViewBag.LastUpdate.
[ <a href="/api/">API</a>
Expand Down
2 changes: 1 addition & 1 deletion src/CoiniumServ/web/default/views/layout/header.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
</h1>
<ol class="breadcrumb">
<li><a href="/"><i class="fa fa-home"></i> Home</a></li>
<li class="active">Blank page</li>
<li class="active">Blank page</li>
</ol>
83 changes: 38 additions & 45 deletions src/CoiniumServ/web/default/views/layout/main.cshtml
Original file line number Diff line number Diff line change
@@ -1,55 +1,48 @@
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<dynamic>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>@ViewBag.Title</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<link href="/Content/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/AdminLTE.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/extra.css" rel="stylesheet" type="text/css" />

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<head>
<meta charset="UTF-8">
<title>@ViewBag.Title</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<link href="/Content/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/AdminLTE.css" rel="stylesheet" type="text/css" />
<link href="/Content/css/extra.css" rel="stylesheet" type="text/css" />

<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
</head>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->

<body class="skin-blue">

@Html.Partial("layout/navbar")
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
</head>

<div class="wrapper row-offcanvas row-offcanvas-left">

<aside class="left-side sidebar-offcanvas">
@Html.Partial("layout/sidebar")
</aside>
<body class="skin-blue">

<aside class="right-side">

<section class="content-header">
@Html.Partial("layout/header")
</section>
@Html.Partial("layout/navbar")

<!-- Main content -->
<section class="content">
@RenderBody()
@Html.Partial("layout/footer")
</section><!-- /.content -->
<div class="wrapper row-offcanvas-left">
<aside class="left-side sidebar-offcanvas">
@Html.Partial("layout/sidebar")
</aside>
<aside class="right-side">
<section class="content-header">
@Html.Partial("layout/header")
</section>
<section class="content">
@RenderBody()
@Html.Partial("layout/footer")
</section>
</aside>
</div>

</aside><!-- /.right-side -->

</div><!-- ./wrapper -->

<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
<script src="/Content/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/Content/js/AdminLTE/app.js" type="text/javascript"></script>
@RenderSection("scripts", false);
</body>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
<script src="/Content/js/bootstrap.min.js" type="text/javascript"></script>
<script src="/Content/js/AdminLTE/app.js" type="text/javascript"></script>
@RenderSection("scripts", false)
</body>
</html>
64 changes: 32 additions & 32 deletions src/CoiniumServ/web/default/views/layout/sidebar.cshtml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<section class="sidebar">
<ul class="sidebar-menu">
<li class="active">
<a href="/">
<i class="ion ion-home"></i>
<span>Home</span>
</a>
</li>
<li>
<a href="/pools/">
<i class="ion ion-beaker"></i>
<span>Pools</span>
</a>
</li>
<li>
<a href="/algorithms/">
<i class="ion ion-gear-a"></i>
<span>Algorithms</span>
</a>
</li>
<li class="treeview">
<a href="#">
<i class="ion ion-help-buoy"></i> <span>Help</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="/help/gettingstarted/" style="margin-left: 10px;"><i class="ion ion-flash"></i> Getting Started</a></li>
<li><a href="/help/miningsoftware/" style="margin-left: 10px;"><i class="fa fa-cogs"></i> Mining Software</a></li>
<li><a href="/api/" style="margin-left: 10px;"><i class="fa fa-signal"></i> API</a></li>
<li><a href="/help/termsofservice/" style="margin-left: 10px;"><i class="fa fa-exclamation-circle"></i> Terms of Service</a></li>
</ul>
</li>
</ul>
<ul class="sidebar-menu">
<li class="active">
<a href="/">
<i class="ion ion-home"></i>
<span>Home</span>
</a>
</li>
<li>
<a href="/pools/">
<i class="ion ion-beaker"></i>
<span>Pools</span>
</a>
</li>
<li>
<a href="/algorithms/">
<i class="ion ion-gear-a"></i>
<span>Algorithms</span>
</a>
</li>
<li class="treeview">
<a href="#">
<i class="ion ion-help-buoy"></i> <span>Help</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
<li><a href="/help/gettingstarted/" style="margin-left: 10px;"><i class="ion ion-flash"></i> Getting Started</a></li>
<li><a href="/help/miningsoftware/" style="margin-left: 10px;"><i class="fa fa-cogs"></i> Mining Software</a></li>
<li><a href="/api/" style="margin-left: 10px;"><i class="fa fa-signal"></i> API</a></li>
<li><a href="/help/termsofservice/" style="margin-left: 10px;"><i class="fa fa-exclamation-circle"></i> Terms of Service</a></li>
</ul>
</li>
</ul>
</section>

0 comments on commit f5e4c67

Please sign in to comment.