Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5072


Ignore:
Timestamp:
12/08/10 14:44:06 (14 years ago)
Author:
dkahn
Message:

#1198 Created design and modified views to create submenus

Location:
branches/WebApplication/MVC2
Files:
17 added
1 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/HLWebOKBAdminPlugin.csproj

    r4985 r5072  
    5050  </PropertyGroup>
    5151  <ItemGroup>
    52     <Reference Include="HLWebPluginHost">
    53       <HintPath>..\..\..\HeuristicLabWeb.PluginHost\HLWebPluginHost\bin\HLWebPluginHost.dll</HintPath>
     52    <Reference Include="HLWebPluginHost, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     53      <SpecificVersion>False</SpecificVersion>
     54      <HintPath>..\HeuristicLabWeb.PluginHost\HLWebPluginHost\bin\HLWebPluginHost.dll</HintPath>
    5455    </Reference>
    5556    <Reference Include="Microsoft.CSharp" />

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

    r4985 r5072  
    44using HLWebPluginHost.PluginLib;
    55using System.Web.UI;
     6using System.Collections;
    67
    78// General Information about an assembly is controlled through the following
    … …  
    4445    action = "index",
    4546    controller = "AlgorithmClass",
    46     name = "OKB Administrator")]
     47    name = "OKB Administrator"
     48    )]

  • branches/WebApplication/MVC2/HLWebOKBAdminPlugin/obj/Plugin/HLWebOKBAdminPlugin.csproj.FileListAbsolute.txt

    r4985 r5072  
    44D:\Proakt\WebApplication\MVC2\HLWebOKBAdminPlugin\HLWebOKBAdminPlugin\obj\Plugin\HLWebOKBAdminPlugin.dll
    55D:\Proakt\WebApplication\MVC2\HLWebOKBAdminPlugin\HLWebOKBAdminPlugin\obj\Plugin\HLWebOKBAdminPlugin.pdb
     6C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HLWebOKBAdminPlugin\obj\Plugin\ResolveAssemblyReference.cache
     7C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HLWebOKBAdminPlugin\bin\HLWebOKBAdminPlugin.dll
     8C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HLWebOKBAdminPlugin\bin\HLWebOKBAdminPlugin.pdb
     9C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HLWebOKBAdminPlugin\bin\HLWebPluginHost.dll
     10C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HLWebOKBAdminPlugin\bin\HLWebPluginHost.pdb
     11C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HLWebOKBAdminPlugin\obj\Plugin\HLWebOKBAdminPlugin.dll
     12C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HLWebOKBAdminPlugin\obj\Plugin\HLWebOKBAdminPlugin.pdb

  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Controllers/HomeController.cs

    r4604 r5072  
    99  public class HomeController : Controller {
    1010    public ActionResult Index() {
    11       ViewData["Message"] = "Welcome to ASP.NET MVC!";
     11      ViewData["Message"] = "Welcome to HeuristicLab Web";
    1212
    1313      return View();

  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/HLWebPluginHost.csproj

    r4986 r5072  
    8888  </ItemGroup>
    8989  <ItemGroup>
     90    <Content Include="Content\themes\hl\images\bg_footer.png" />
     91    <Content Include="Content\themes\hl\images\bg_header.png" />
     92    <Content Include="Content\themes\hl\images\bg_main.png" />
     93    <Content Include="Content\themes\hl\images\bg_mainmenu.png" />
     94    <Content Include="Content\themes\hl\images\hl-logo.png" />
     95    <Content Include="Content\themes\hl\Site.css" />
    9096    <Content Include="Global.asax" />
    9197    <None Include="Service References\OKBService\configuration91.svcinfo" />
    … …  
    146152      <SubType>Designer</SubType>
    147153    </Content>
    148     <Content Include="Content\Site.css" />
     154    <Content Include="Content\themes\default\Site.css" />
    149155    <Content Include="Scripts\jquery-1.4.1.js" />
    150156    <Content Include="Scripts\jquery-1.4.1.min.js" />

  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/Home/Index.aspx

    r4950 r5072  
    66
    77<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
    8     <h2><%: ViewData["Message"] %></h2>
    9     <p>
    10         To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>.
    11     </p>
     8    <h1><%: ViewData["Message"] %></h1>
    129
    1310    <h3>Password: <%: Session["pwd"]  %></h3>

  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/Shared/LogOnUserControl.ascx

    r4604 r5072  
    44%>
    55        Welcome <b><%: Page.User.Identity.Name %></b>!
    6         [ <%: Html.ActionLink("Log Off", "LogOff", "Account") %> ]
     6        <%: Html.ActionLink("Log Off", "LogOff", "Account") %>
    77<%
    88    }
    99    else {
    1010%>
    11         [ <%: Html.ActionLink("Log On", "LogOn", "Account") %> ]
     11        <%: Html.ActionLink("Log On", "LogOn", "Account") %>
    1212<%
    1313    }

  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/Views/Shared/Site.Master

    r4604 r5072  
    77    <asp:ContentPlaceHolder ID="TitleContent" runat="server" />
    88  </title>
    9   <link href="../../Content/Site.css" rel="stylesheet" type="text/css" />
     9  <link href="../../Content/themes/hl/Site.css" rel="stylesheet" type="text/css" />
    1010</head>
    1111<body>
     12  <div id="master-page">
     13    <div id="master-header">
     14      <div class="logo">
     15        <%: Html.ActionLink("HeuristicLabWeb", "Index", "Home")%>
     16      </div>
     17      <div class="login">
     18        <% Html.RenderPartial("LogOnUserControl"); %>
     19      </div>
     20    </div>
     21    <div id="master-mainmenu">
     22      <ul id="menu">
     23        <li <% if(ViewContext.RouteData.Values["controller"].ToString() == "Home") {%> class="selected"
     24          <%}%>>
     25          <%: Html.ActionLink("Home", "Index", "Home")%></li>
     26        <% foreach (var pluginLink in
     27          HLWebPluginHost.PluginLib.PluginHelper.GetPluginActions()) {  %>
     28        <li <% if(ViewContext.RouteData.Values["controller"].ToString() == pluginLink.Controller) {%>
     29          class="selected" <%}%>>
     30          <%: Html.ActionLink(pluginLink.Name,
     31                            pluginLink.Action,
     32                            pluginLink.Controller)%>
     33        </li>
     34        <% } %>
     35        <li <% if(ViewContext.RouteData.Values["action"].ToString() == "About") {%> class="selected"
     36          <%}%>>
     37          <%: Html.ActionLink("About", "About", "Home")%></li>
     38      </ul>
     39    </div>
     40 
     41    <div id="master-main">
     42             <div id="master-submenu">
     43        <asp:ContentPlaceHolder ID="SubMenuContent" runat="server" />
     44      </div>
     45      <div id="master-MainContent">
     46        <asp:ContentPlaceHolder ID="MainContent" runat="server" />
     47      </div>
     48      <div id="master-footer">
     49        <div class="logo">
     50          <a href="http://www.heuristiclab.com/" target="_blank" title="Visit the HeuristicLab website">
     51            <img src="../../Content/themes/hl/images/hl-logo.png" alt="HeuristicLab" /></a>
     52        </div>
     53      </div>
     54    </div>
     55  </div>
     56  <!--
    1257  <div class="page">
    1358    <div id="header">
    … …  
    3782    </div>
    3883    <div id="main">
    39       <asp:ContentPlaceHolder ID="MainContent" runat="server" />
     84      <asp:ContentPlaceHolder ID="MainContent2" runat="server" />
    4085      <div id="footer">
    4186      </div>
    4287    </div>
    4388  </div>
     89  -->
    4490</body>
    4591</html>

  • branches/WebApplication/MVC2/HeuristicLabWeb.PluginHost/HLWebPluginHost/obj/Debug/HLWebPluginHost.csproj.FileListAbsolute.txt

    r4939 r5072  
    44D:\Proakt\WebApplication\MVC2\HeuristicLabWeb.PluginHost\HLWebPluginHost\obj\Debug\HLWebPluginHost.dll
    55D:\Proakt\WebApplication\MVC2\HeuristicLabWeb.PluginHost\HLWebPluginHost\obj\Debug\HLWebPluginHost.pdb
     6C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HeuristicLabWeb.PluginHost\HLWebPluginHost\bin\HLWebPluginHost.dll
     7C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HeuristicLabWeb.PluginHost\HLWebPluginHost\bin\HLWebPluginHost.pdb
     8C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HeuristicLabWeb.PluginHost\HLWebPluginHost\obj\Debug\ResolveAssemblyReference.cache
     9C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HeuristicLabWeb.PluginHost\HLWebPluginHost\obj\Debug\HLWebPluginHost.dll
     10C:\Documents and Settings\vs6\My Documents\SPR5\WebApplication\MVC2\HeuristicLabWeb.PluginHost\HLWebPluginHost\obj\Debug\HLWebPluginHost.pdb

  • branches/WebApplication/MVC2/HeuristicLabWeb.Plugins/HLWebHelloWorldPlugin/HLWebHelloWorldPlugin/Controllers/HelloWorldController.cs

    r4605 r5072  
    1313            return View();
    1414        }
     15
     16        public ActionResult Menu() {
     17          return View();
     18        }
     19
    1520    }
    1621}

  • branches/WebApplication/MVC2/HeuristicLabWeb.Plugins/HLWebHelloWorldPlugin/HLWebHelloWorldPlugin/HLWebHelloWorldPlugin.csproj

    r4613 r5072  
    9797    <Content Include="Global.asax" />
    9898    <Content Include="Views\HelloWorld\Index.aspx" />
     99    <EmbeddedResource Include="Views\HelloWorld\Menu.ascx" />
    99100    <Content Include="Web.config" />
    100101    <Content Include="Web.Debug.config">

  • branches/WebApplication/MVC2/HeuristicLabWeb.Plugins/HLWebHelloWorldPlugin/HLWebHelloWorldPlugin/Properties/AssemblyInfo.cs

    r4605 r5072  
    3636[assembly: AssemblyFileVersion("1.0.0.0")]
    3737[assembly: HLWebPluginViewLocations(
    38     new string[] { "~/Plugins/HLWebHelloWorldPlugin.dll/HLWebHelloWorldPlugin.Views.{1}.{0}.aspx" },
     38    new string[] { "~/Plugins/HLWebHelloWorldPlugin.dll/HLWebHelloWorldPlugin.Views.{1}.{0}.aspx", "~/Plugins/HLWebHelloWorldPlugin.dll/HLWebHelloWorldPlugin.Views.{1}.{0}.ascx" },
    3939    true,
    4040    action = "index",

  • branches/WebApplication/MVC2/HeuristicLabWeb.Plugins/HLWebHelloWorldPlugin/HLWebHelloWorldPlugin/Views/HelloWorld/Index.aspx

    r4605 r5072  
    11<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %>
     2
     3<asp:Content ID="Content3" runat="server" ContentPlaceHolderID="SubMenuContent">
     4<% Html.RenderAction("Menu"); %>
     5</asp:Content>
    26
    37<asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server">
Note: See TracChangeset for help on using the changeset viewer.