trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Reverted removal of SMS ticker

This commit is contained in:
HojouFotytu 2019-03-19 00:56:38 +09:00
parent 4bb4d01ed8
commit 4f618babe0
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Monitor/Pages/MarketAnalyzer.cshtml
View File

@ -8,6 +8,15 @@
<link href="@Html.Raw(Model.PTMagicConfiguration.GeneralSettings.Monitor.RootUrl)assets/plugins/tablesaw/css/tablesaw.css" rel="stylesheet" type="text/css" /> <link href="@Html.Raw(Model.PTMagicConfiguration.GeneralSettings.Monitor.RootUrl)assets/plugins/tablesaw/css/tablesaw.css" rel="stylesheet" type="text/css" />
<link href="@Html.Raw(Model.PTMagicConfiguration.GeneralSettings.Monitor.RootUrl)assets/plugins/nvd3/nv.d3.min.css" rel="stylesheet" type="text/css" /> <link href="@Html.Raw(Model.PTMagicConfiguration.GeneralSettings.Monitor.RootUrl)assets/plugins/nvd3/nv.d3.min.css" rel="stylesheet" type="text/css" />
} }
<div class="row">
<div class="col-sm-12">
<div class="card-box">
<h4 class="m-t-0 header-title text-center">Current &nbsp; @Model.Summary.MainMarket &nbsp; Price:<text class="text-autocolor">&nbsp; &nbsp; @Html.Raw(Model.MainFiatCurrencySymbol + Model.Summary.MainMarketPrice.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))) &nbsp; </text> <small> <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="This is the value of your market currency."></i></small></h4>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="card-box"> <div class="card-box">

25
Monitor/Pages/SalesAnalyzer.cshtml
View File

@ -13,22 +13,19 @@
} }
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="card-box"> <div class="card-box">
@{
@{ double currentBalance = Model.PTData.GetCurrentBalance();
double currentBalance = Model.PTData.GetCurrentBalance(); string currentBalanceString = currentBalance.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"));
string currentBalanceString = currentBalance.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")); if (currentBalance > 100) {
if (currentBalance > 100) { currentBalanceString = Math.Round(currentBalance, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"));
currentBalanceString = Math.Round(currentBalance, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")); }
} }
} <h4 class="m-t-0 header-title text-center">Total Account Value: &nbsp; &nbsp; <text class="text-autocolor"> @currentBalanceString &nbsp; @Model.Summary.MainMarket &nbsp; </text> <small> <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="This value is estimated based on your sales history and any entries on the Transactions page"></i></small></h4>
<h4 class="m-t-0 header-title text-autocolor">@Model.Summary.MainMarket &nbsp; Balance: &nbsp; &nbsp; @currentBalanceString &nbsp; &nbsp; <small> <i class="fa fa-info-circle text-muted" data-toggle="tooltip" data-placement="top" title="This value is estimated based on your sales history and any entries on the Transactions page"></i></small></h4>
</div>
</div> </div>
</div> </div>
</div>
@if (Model.PTData.SellLog.Count == 0) { @if (Model.PTData.SellLog.Count == 0) {
<div class="row"> <div class="row">

2
Monitor/Pages/_Layout.cshtml
View File

@ -41,7 +41,7 @@
<!-- End Logo container--> <!-- End Logo container-->
<div class="menu-extras topbar-custom"> <div class="menu-extras topbar-custom">
<ul class="list-inline float-left mb-0"> <ul class="list-inline float-right mb-0">
<li id="ticker-widgets" class="list-inline-item ticker-widgets"></li> <li id="ticker-widgets" class="list-inline-item ticker-widgets"></li>
<li class="menu-item list-inline-item"> <li class="menu-item list-inline-item">
<!-- Mobile menu toggle--> <!-- Mobile menu toggle-->

8
Monitor/Pages/_get/TickerWidgets.cshtml
View File

@ -30,11 +30,15 @@
} }
<div class="card-box card-box-mini card-box-ptmagic-outlined" data-toggle="tooltip" data-placement="bottom" title="Active global setting"> <div class="card-box card-box-mini card-box-ptmagic-outlined" data-toggle="tooltip" data-placement="bottom" title="Active global setting">
<b>GS:</b> @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName) @Core.Helper.SystemHelper.SplitCamelCase(Model.Summary.CurrentGlobalSetting.SettingName)
</div>
<div class="card-box card-box-mini card-box-ptmagic-outlined" data-toggle="tooltip" data-placement="bottom" title="Active single market settings">
<b>SMS:</b> <a href="ManageSMS">@Html.Raw(singleSettingInfoIcon)</a> @activeSingleSettings
</div> </div>
<div class="card-box card-box-mini card-box-ptmagic-status-outlined @iconColor" data-toggle="tooltip" data-placement="bottom" title="@ptMagicHealthTooltip"> <div class="card-box card-box-mini card-box-ptmagic-status-outlined @iconColor" data-toggle="tooltip" data-placement="bottom" title="@ptMagicHealthTooltip">
<b>PTM: </b><i class="fa @ptMagicHealthIcon @iconColor"></i> <i class="fa @ptMagicHealthIcon @iconColor"></i>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">