Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6290


Ignore:
Timestamp:
05/25/11 15:00:44 (14 years ago)
Author:
dkahn
Message:

#1433 Plugin styling

Location:
branches/WebApplication/MVC2/HLWebOKBAdminPlugin
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AdminController.cs

    r6246 r6290  
    1010using HLWebOKBAdminPlugin.Helpers;
    1111using HLWebOKBAdminPlugin.Models;
     12using System.Reflection;
    1213
    1314namespace HLWebOKBAdminPlugin.Controllers {
    … …  
    2829
    2930        public ActionResult Menu() {
     31           
    3032            return View();
    3133        }//ActionResult Men

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Controllers/AlgorithmClassController.cs

    r6283 r6290  
    1414        // GET: /AlgorithmClass/
    1515
    16         public ActionResult Index()
    17         {
     16        public ActionResult Index() {
     17
    1818            Session["SelectedSubMenu"] = "AlgorithmClass";
    1919            AlgorithmClassModel acm = new AlgorithmClassModel();

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Properties/AssemblyInfo.cs

    r6050 r6290  
    3737[assembly: AssemblyVersion("1.0.0.0")]
    3838[assembly: AssemblyFileVersion("1.0.0.0")]
    39 [assembly: WebResource("HLWebOKBAdminPlugin.Resources.Delete.bmp", "image/bmp")]
    40 [assembly: WebResource("HLWebOKBAdminPlugin.Resources.Plus.bmp", "image/bmp")]
    41 [assembly: WebResource("HLWebOKBAdminPlugin.Resources.Update.bmp", "image/bmp")]
     39
    4240[assembly: HLWebPluginViewLocations(
    4341    new string[] { "~/Plugins/HLWebOKBAdminPlugin.dll/HLWebOKBAdminPlugin.Views.{1}.{0}.aspx", "~/Plugins/HLWebOKBAdminPlugin.dll/HLWebOKBAdminPlugin.Views.{1}.{0}.ascx" },

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Detail.aspx

    r6246 r6290  
    55<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    66    Detail
     7</asp:Content>
     8<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     9   <% Html.RenderAction("Menu", "Admin"); %>
    710</asp:Content>
    811<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Algorithm/Index.aspx

    r6246 r6290  
    44<%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
    55<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    6     Index
     6  Index
     7</asp:Content>
     8<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     9  <% Html.RenderAction("Menu", "Admin"); %>
    710</asp:Content>
    811<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
    9     <h2>Algorithms</h2>
    10    
    11    
    12    
    13     <%  long? id = null;  %>
    14     <%: Html.ActionLink("New Algorithm", "Detail", new {id}) %>
    15     <%: Html.ActionLink("Order ASC", "SortAsc")%>
    16     <%: Html.ActionLink("Order DESC", "SortDesc")%>
    17 
    18     <div style="height:150px; overflow:scroll;">
    19         <table>
    20             <!--// We get this from the Controller (Index)-->
    21             <% foreach(Algorithm p in ((AlgorithmModel)Model).Algorithms) {  %>
    22             <tr>
    23                 <td>
    24                     <%: Html.Label(p.Name)%>
    25                 </td>
    26                 <td>
    27                     <%: Html.Label(p.Description) %>
    28                 </td>
    29                 <td>
    30                     <%: Html.Label(p.DataTypeName)%>
    31                 </td>
    32                 <td>
    33                     <%: Html.ActionLink("detail", "Detail",new {p.Id}) %>
    34                 </td>
    35                 <td>
    36                     <%: Html.ActionLink("delete", "Delete",new {p.Id}) %>
    37                 </td>
    38             </tr>
    39             <% } %>
    40         </table>
    41     </div>       
     12  <h2>
     13    Algorithms</h2>
     14  <%  long? id = null;  %>
     15  <div class="hl-menuButtons">
     16  <%: Html.ActionLink("New Algorithm", "Detail", new { id }, new { @class = "hl-button-text-plus" })%>
     17  </div>
     18  <table class="hl-dataTable">
     19    <thead>
     20      <tr>
     21        <th>Name</th>
     22        <th>Description</th>
     23        <th>Type</th>
     24        <th colspan="2">Actions</th>
     25      </tr>
     26    </thead>
     27    <tbody>
     28      <!--// We get this from the Controller (Index)-->
     29      <% foreach (Algorithm p in ((AlgorithmModel)Model).Algorithms) {  %>
     30      <tr>
     31        <td>
     32          <%: Html.Label(p.Name)%>
     33        </td>
     34        <td>
     35          <%: Html.Label(p.Description) %>
     36        </td>
     37        <td>
     38          <%: Html.Label(p.DataTypeName)%>
     39        </td>
     40        <td>
     41          <%: Html.ActionLink("detail", "Detail", new { p.Id }, new { @class = "hl-icon-edit" })%>
     42        </td>
     43        <td>
     44          <%: Html.ActionLink("delete", "Delete", new { p.Id }, new { @class = "hl-icon-delete" })%>
     45        </td>
     46      </tr>
     47      <% } %>
     48    </tbody>
     49  </table>
    4250</asp:Content>

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Detail.aspx

    r6271 r6290  
    55<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    66    Detail
     7</asp:Content>
     8<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     9   <% Html.RenderAction("Menu", "Admin"); %>
    710</asp:Content>
    811<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/AlgorithmClass/Index.aspx

    r6271 r6290  
    44<%@ Import Namespace="HLWebOKBAdminPlugin.OKBAdministrationService" %>
    55
    6 
    76<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    87    Index
    98</asp:Content>
    10 
     9<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     10   <% Html.RenderAction("Menu", "Admin"); %>
     11</asp:Content>
    1112<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
    1213

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Detail.aspx

    r6246 r6290  
    55<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    66    Detail
     7</asp:Content>
     8<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     9   <% Html.RenderAction("Menu", "Admin"); %>
    710</asp:Content>
    811<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Problem/Index.aspx

    r6246 r6290  
    55<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    66    Index
     7</asp:Content>
     8<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     9   <% Html.RenderAction("Menu", "Admin"); %>
    710</asp:Content>
    811<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Detail.aspx

    r6246 r6290  
    66<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
    77  Detail
     8</asp:Content>
     9<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     10   <% Html.RenderAction("Menu", "Admin"); %>
    811</asp:Content>
    912<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/ProblemClass/Index.aspx

    r6246 r6290  
    88  Index
    99</asp:Content>
    10 
     10<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     11   <% Html.RenderAction("Menu", "Admin"); %>
     12</asp:Content>
    1113<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
    1214

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Views/Shared/Site.Master

    r4985 r6290  
    44<html xmlns="http://www.w3.org/1999/xhtml">
    55<head runat="server">
    6     <title><asp:ContentPlaceHolder ID="TitleContent" runat="server" /></title>
    7     <link href="../../Content/Site.css" rel="stylesheet" type="text/css" />
     6  <title>
     7    <asp:ContentPlaceHolder ID="TitleContent" runat="server" />
     8  </title>
     9  <link href="../../Content/Site.css" rel="stylesheet" type="text/css" />
    810</head>
     11<body>
     12  <div class="page">
     13    <div id="header">
     14      <div id="title">
     15        <h1>
     16          My MVC Application</h1>
     17      </div>
     18      <div id="logindisplay">
     19        <% Html.RenderPartial("LogOnUserControl"); %>
     20      </div>
     21      <div id="menucontainer">
     22        <ul id="menu">
     23          <li>
     24            <%: Html.ActionLink("Home", "Index", "Home")%></li>
     25          <li>
     26            <%: Html.ActionLink("About", "About", "Home")%></li>
     27        </ul>
     28      </div>
     29    </div>
    930
    10 <body>
    11     <div class="page">
    12 
    13         <div id="header">
    14             <div id="title">
    15                 <h1>My MVC Application</h1>
    16             </div>
    17              
    18             <div id="logindisplay">
    19                 <% Html.RenderPartial("LogOnUserControl"); %>
    20             </div>
    21            
    22             <div id="menucontainer">
    23            
    24                 <ul id="menu">             
    25                     <li><%: Html.ActionLink("Home", "Index", "Home")%></li>
    26                     <li><%: Html.ActionLink("About", "About", "Home")%></li>
    27                 </ul>
    28            
    29             </div>
    30         </div>
    31 
    32         <div id="main">
    33             <asp:ContentPlaceHolder ID="MainContent" runat="server" />
    34 
    35             <div id="footer">
    36             </div>
    37         </div>
     31    <div id="main">
     32        <div id="master-submenu">
     33      <asp:ContentPlaceHolder ID="SubMenuContent" runat="server" />
    3834    </div>
     35      <asp:ContentPlaceHolder ID="MainContent" runat="server" />
     36      <div id="footer">
     37      </div>
     38    </div>
     39  </div>
    3940</body>
    4041</html>
Note: See TracChangeset for help on using the changeset viewer.