Skip to content

C
CAP
Commit 773efb6c authored by yangxiaodong's avatar yangxiaodong
Browse files
Options

modify html two table to one table.

parent 2992a7ba
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 68 deletions
src/DotNetCore.CAP/Dashboard/Content/css/cap.css
View file @ 773efb6c
...@@ -532,14 +532,10 @@ div.metric-null { ...@@ -532,14 +532,10 @@ div.metric-null {
} }
} }
table.margin-bottom-zero {
margin-bottom: 0px;
}
.subscribe-table td { .subscribe-table td {
border-top: none !important; vertical-align:middle !important;
} }
.subscribe-table tr + tr td { .subscribe-table td[rowspan]{
border-top: 1px solid #ddd !important; font-weight:bold;
} }
\ No newline at end of file
src/DotNetCore.CAP/Dashboard/Pages/SubscriberPage.cshtml
View file @ 773efb6c
...@@ -18,41 +18,41 @@ ...@@ -18,41 +18,41 @@
@if (subscribers.Count == 0) @if (subscribers.Count == 0)
{ {
<div class="alert alert-warning"> <div class="alert alert-warning">
@Strings.ServersPage_NoServers @Strings.ServersPage_NoServers
</div> </div>
} }
else else
{ {
<div class="table-responsive"> <div class="table-responsive">
<table class="table"> <table class="table subscribe-table">
<thead> <thead>
<tr> <tr>
<th width="20%">@Strings.Common_Group</th> <th width="20%">@Strings.Common_Group</th>
<th> <th width="40%">
<table class="table subscribe-table margin-bottom-zero"><tr><td width="40%">@Strings.Common_Name</td><td>@Strings.Common_Method</td></tr></table> @Strings.Common_Name
</th> </th>
<th>@Strings.Common_Method</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach (var subscriber in subscribers) @foreach (var subscriber in subscribers)
{ {
<tr> var i = 0;
<td style="vertical-align:middle;font-weight:bold;">@subscriber.Key</td>
<td>
<table class="table subscribe-table table-condensed margin-bottom-zero">
@foreach (var column in subscriber.Value) @foreach (var column in subscriber.Value)
{ {
<tr> <tr>
<td width="40%">@column.Attribute.Name</td> @if (i == 0)
<td><span style="color:#00bcd4">@column.ImplTypeInfo.Name</span>： {
<td rowspan="@subscriber.Value.Count">@subscriber.Key</td>
}
<td>@column.Attribute.Name</td>
<td>
<span style="color:#00bcd4">@column.ImplTypeInfo.Name</span>：
@Html.MethodEscaped(column.MethodInfo) @Html.MethodEscaped(column.MethodInfo)
</td> </td>
</tr> </tr>
i++;
} }
</table>
</td>
</tr>
} }
</tbody> </tbody>
</table> </table>
......
src/DotNetCore.CAP/Dashboard/Pages/SubscriberPage.generated.cs
View file @ 773efb6c
...@@ -91,11 +91,11 @@ WriteLiteral("</h1>\r\n\r\n"); ...@@ -91,11 +91,11 @@ WriteLiteral("</h1>\r\n\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div class=\"alert alert-warning\">\r\n\r\n "); WriteLiteral(" <div class=\"alert alert-warning\">\r\n ");
#line 22 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 21 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(Strings.ServersPage_NoServers); Write(Strings.ServersPage_NoServers);
...@@ -105,7 +105,7 @@ WriteLiteral("\r\n </div>\r\n"); ...@@ -105,7 +105,7 @@ WriteLiteral("\r\n </div>\r\n");
#line 24 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 23 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
} }
else else
{ {
...@@ -113,123 +113,141 @@ WriteLiteral("\r\n </div>\r\n"); ...@@ -113,123 +113,141 @@ WriteLiteral("\r\n </div>\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral(" <div class=\"table-responsive\">\r\n <table class=\"table\">" + WriteLiteral(" <div class=\"table-responsive\">\r\n <table class=\"table s" +
"\r\n <thead>\r\n <tr>\r\n " + "ubscribe-table\">\r\n <thead>\r\n <tr>\r\n " +
" <th width=\"20%\">"); " <th width=\"20%\">");
#line 31 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 30 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(Strings.Common_Group); Write(Strings.Common_Group);
#line default #line default
#line hidden #line hidden
WriteLiteral("</th>\r\n <th>\r\n <table c" + WriteLiteral("</th>\r\n <th width=\"40%\">\r\n " +
"lass=\"table subscribe-table margin-bottom-zero\"><tr><td width=\"40%\">"); " ");
#line 33 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 32 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(Strings.Common_Name); Write(Strings.Common_Name);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td><td>"); WriteLiteral("\r\n </th>\r\n <th>");
#line 33 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 34 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(Strings.Common_Method); Write(Strings.Common_Method);
#line default #line default
#line hidden #line hidden
WriteLiteral("</td></tr></table>\r\n </th>\r\n </" + WriteLiteral("</th>\r\n </tr>\r\n </thead>\r\n " +
"tr>\r\n </thead>\r\n <tbody>\r\n"); " <tbody>\r\n");
#line 38 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 38 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
foreach (var subscriber in subscribers) foreach (var subscriber in subscribers)
{ {
var i = 0;
#line default #line default
#line hidden #line hidden
WriteLiteral(" <tr>\r\n <td style=\"vert" +
"ical-align:middle;font-weight:bold;\">");
#line 41 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 41 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(subscriber.Key); foreach (var column in subscriber.Value)
{
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td>\r\n " + WriteLiteral(" <tr>\r\n");
"<table class=\"table subscribe-table table-condensed margin-bottom-zero\">\r\n");
#line 44 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 44 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
foreach (var column in subscriber.Value) if (i == 0)
{ {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <tr>\r\n " + WriteLiteral(" <td rowspan=\"");
" <td width=\"40%\">");
#line 46 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(subscriber.Value.Count);
#line default
#line hidden
WriteLiteral("\">");
#line 46 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(subscriber.Key);
#line default
#line hidden
WriteLiteral("</td>\r\n");
#line 47 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 47 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(column.Attribute.Name); }
#line default #line default
#line hidden #line hidden
WriteLiteral("</td>\r\n <td><span style=\"color:#00" + WriteLiteral(" <td>");
"bcd4\">");
#line 48 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 48 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(column.ImplTypeInfo.Name); Write(column.Attribute.Name);
#line default #line default
#line hidden #line hidden
WriteLiteral("</span>： \r\n "); WriteLiteral("</td>\r\n <td>\r\n " +
" <span style=\"color:#00bcd4\">");
#line 49 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 50 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
Write(Html.MethodEscaped(column.MethodInfo)); Write(column.ImplTypeInfo.Name);
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n </td>\r\n " + WriteLiteral("</span>：\r\n ");
" </tr>\r\n");
#line 52 "..\..\Dashboard\Pages\SubscriberPage.cshtml" #line 51 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
} Write(Html.MethodEscaped(column.MethodInfo));
#line default #line default
#line hidden #line hidden
WriteLiteral(" </table>\r\n </t" + WriteLiteral("\r\n </td>\r\n </tr" +
"d>\r\n </tr>\r\n"); ">\r\n");
#line 56 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
#line 54 "..\..\Dashboard\Pages\SubscriberPage.cshtml"
i++;
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment