Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/17/12 09:37:16 (12 years ago)
Author:
fschoepp
Message:

#1888:
Backend changes:

  • Simplified job state detection (only one hive call will be made to detect all states now, instead of one additional call per job)
  • Reorganized classes (moved model classes into Model folder)

Website changes:

  • Website now heavily uses JavaScript to achieve better user experience
  • JavaScript degrades gracefully, except for plots
  • Tables: Added jquery-datatable-plugin to extend tables (pagination + search functionality)
  • OaaS-Website now uses the design of the HL websites (found in WebApplication branch)
  • Added jqplot to render zoomable line plots for HL-Datatables
  • Styling.js: Plots will be generated by using an ajax call; additional jquery-styling occurs within this file.
  • Added jquery-ui-1.9.2 which is capable of handling/rendering tabs, accordions and resizers.
Location:
branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/DisplayTemplates/DecimalMatrix.cshtml

    r8817 r9062  
    11@model HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix
    22
    3 <table>
    4   <tr>
    5     <th>@Model.Name</th>
    6   </tr>
    7   @for (int i = 0; i < Model.Value.Length; i++) {
    8   <tr>
    9     @for (int j = 0; j < Model.Value[i].Length; j++) {                     
    10     <td>
    11       @Model.Value[i][j]
    12     </td>
    13     }
    14   </tr>
    15   }
     3<table class="viewableTable">
     4  <thead>
     5      <tr>
     6        <th>@Model.Name</th>
     7      </tr>
     8  </thead>
     9  <tbody>
     10      @for (int i = 0; i < Model.Value.Length; i++) {
     11      <tr>
     12        @if (Model.RowNames.Length > i) {
     13        <th scope="row">@Model.RowNames[i]</th>
     14        }
     15        @for (int j = 0; j < Model.Value[i].Length; j++) {                     
     16        <td>
     17          @Model.Value[i][j]
     18        </td>
     19        }
     20      </tr>
     21      }
     22  </tbody>
    1623</table>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/DisplayTemplates/InputParameters.cshtml

    r8506 r9062  
    22
    33@foreach (var itm in Model.Items) {
    4     <div class="editor-label">
     4    <div class="editor-label param-input">
    55        @Html.Label(itm.Value.Name, itm.Value.Name)
    66    </div>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/EditorTemplates/DecimalMatrix.cshtml

    r8817 r9062  
    11@model HeuristicLab.Services.Optimization.ControllerService.Model.DecimalMatrix
    22
    3 <table>
    4   <tr>
    5     <th>@Model.Name</th>
    6   </tr>
     3<table class="editableTable">
     4  <thead>
     5      <tr>
     6      @for (int i = 0; i < Model.Value[0].Length; i++) {
     7        <th>@Model.Name Column @i</th>
     8      }
     9      <th>Delete</th>
     10      <th>Add</th>
     11      </tr>
     12  </thead>
     13  <tbody>
    714  @for (int i = 0; i < Model.Value.Length; i++) {
    8   <tr>
     15  <tr id="@i">
    916    @for (int j = 0; j < Model.Value[i].Length; j++) {                     
    1017    <td>
    … …  
    1219    </td>
    1320    }
    14   </tr>
     21    <td><a class="delete-row" href="#">Delete</a></td>
     22    <td><input type="submit" name="AddRow" value="Add Row"/></td>
     23  </tr> 
    1524  }
     25  </tbody>
    1626</table>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/EditorTemplates/DecimalVector.cshtml

    r8506 r9062  
    22 
    33<table>
     4<thead>
    45  <tr>
    56    <th>@Model.Name</th>
    67  </tr>
     8  </thead>
     9  <tbody>
    710  @for (int i = 0; i < Model.Value.Length; i++) {
    811  <tr>
    … …  
    1215  </tr>
    1316  }
     17  </tbody>
    1418</table>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/_Layout.cshtml

    r8958 r9062  
    44    <meta charset="utf-8" />
    55    <title>@ViewBag.Title</title>
    6     <link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
    7     <script src="@Url.Content("~/Scripts/jquery-1.5.1.min.js")" type="text/javascript"></script>
     6    <link href="@Url.Content("~/Content/hl/Site.css")" rel="stylesheet" type="text/css" />
     7    <link href="@Url.Content("~/Content/datatable/css/jquery.dataTables.css")" rel="stylesheet" type="text/css" />
     8    <link href="@Url.Content("~/Content/ui-lightness/jquery-ui-1.9.2.min.css")" rel="stylesheet" type="text/css" />   
     9    <link href="@Url.Content("~/Content/jqplot/src/jquery.jqplot.css")" rel="stylesheet" type="text/css" />
     10   
     11    <script src="@Url.Content("~/Scripts/jquery-1.8.3.min.js")" type="text/javascript"></script>
     12    <script src="@Url.Content("~/Scripts/jquery.dataTables.min.js")" type="text/javascript"></script>
     13    <script src="@Url.Content("~/Scripts/jquery-ui-1.9.2.min.js")" type="text/javascript"></script>
    814    <script src="@Url.Content("~/Scripts/modernizr-1.7.min.js")" type="text/javascript"></script>
     15    <script src="@Url.Content("~/Content/Styling.js")" type="text/javascript"></script>
     16
     17    <!--[if lt IE 9]><script language="javascript" type="text/javascript" src="/Content/jqplot/src/excanvas.js"></script><![endif]-->
     18    <script src="@Url.Content("~/Content/jqplot/src/jquery.jqplot.js")" type="text/javascript"></script>
     19    <script src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.canvasTextRenderer.js")" type="text/javascript"></script>
     20    <script src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.canvasAxisLabelRenderer.js")" type="text/javascript"></script>
     21    <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.barRenderer.js")"></script>
     22    <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.categoryAxisRenderer.js")"></script>
     23    <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.pointLabels.js")"></script>
     24    <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.pieRenderer.js")"></script>
     25    <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.donutRenderer.js")"></script>
     26    <script type="text/javascript" src="@Url.Content("~/Content/jqplot/src/plugins/jqplot.cursor.js")"></script>
    927</head>
    1028<body>
    11     <div class="page">
    12         <header>
    13             <div id="title">
    14                 <h1>Optimization-as-a-Service</h1>
    15             </div>
    16             <div id="logindisplay">
     29    <div id="master-page">
     30       
     31        <div id="master-header">
     32            <div class="logo">
     33                <a href="/">Optimization-as-a-Service</a>
     34            </div>       
     35            <div class="login">
    1736                @Html.Partial("_LogOnPartial")
    1837            </div>
    19             <nav>
    20                 <ul id="menu">
    21                     <li>@Html.ActionLink("Admin", "Index", "Admin")</li>
    22                     <li>@Html.ActionLink("Home", "Index", "Home")</li>
    23                     <li>@Html.ActionLink("About", "About", "Home")</li>
    24                 </ul>
    25             </nav>
    26         </header>
    27         <section id="main">
    28             @RenderBody()
    29         </section>
    30         <footer>
    31         </footer>
     38        </div>
     39        <div id="master-mainmenu">
     40            <ul id="menu">
     41                <li>@Html.ActionLink("Admin", "Index", "Admin")</li>
     42                <li>@Html.ActionLink("Home", "Index", "Home")</li>
     43                <li>@Html.ActionLink("About", "About", "Home")</li>
     44            </ul>
     45        </div>
     46       
     47        <div id="master-main">
     48            <div id="master-submenu"/>
     49            <div id="master-MainContent">               
     50                @RenderBody()               
     51            </div>
     52        </div>
     53        <div id="master-footer">
     54            <div class="logo">
     55                <a title="Visit the HeuristicLab website" href="http://www.heuristiclab.com/" target="_blank">
     56                    <img alt="HeuristicLab" src="/Content/hl/images/hl-logo.png" />
     57                </a>
     58            </div>
     59        </div>
     60        <!--footer>
     61        </footer-->
    3262    </div>
    3363</body>

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Shared/_LogOnPartial.cshtml

    r8384 r9062  
    11@if(Request.IsAuthenticated) {
    22    <text>Welcome <strong>@User.Identity.Name</strong>!
    3     [ @Html.ActionLink("Log Off", "LogOff", "Account") ]</text>
     3    @Html.ActionLink("Log Off", "LogOff", "Account")</text>
    44}
    55else {
    6     @:[ @Html.ActionLink("Log On", "LogOn", "Account") ]
     6    @Html.ActionLink("Log On", "LogOn", "Account")
    77}
Note: See TracChangeset for help on using the changeset viewer.