Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/30/16 16:52:40 (9 years ago)
Author:
jlodewyc
Message:

#2582 Start angular OKB manager, data loaded

Location:
branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Index.cshtml

    r13860 r13862  
    88<div class="animated fadeIn">
    99    <!-- Main nav menu-->
    10     @Html.Partial("Navbar", new NavbarViewModel("Job", Model.currentUser))
     10    @Html.Partial("Navbar", new NavbarViewModel("Job", Model.User))
    1111
    1212    <!-- Job menu-->

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml

    r13860 r13862  
    1414    <div id="userId" style="display:none">@ViewBag.SessionId</div>
    1515    <!-- Main nav menu -->
    16     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
     16    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
    1717
    1818    <!-- Job menu-->

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml

    r13847 r13862  
    4848                    <span class="input-group-addon"
    4949                          id="basic-addon3">
    50                         .../uploads/@(Model.currentUser.currentUser.UserName != null ?  Model.currentUser.currentUser.UserName : Model.currentUser.currentUser.FullName)/
     50                        .../uploads/@(Model.User.currentUser.UserName != null ?  Model.User.currentUser.UserName : Model.User.currentUser.FullName)/
    5151                    </span>
    5252                    <input type="text"

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml

    r13860 r13862  
    55<div class="animated fadeIn">
    66
    7     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
     7    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
    88
    99    <ul class="nav nav-pills nav-justified">

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/Navbar.cshtml

    r13860 r13862  
    7777    </li>
    7878    <li role="presentation"
     79        class="@(Model.Active == "OKBAdmin" ? "active" : "")
     80        @(Model.User.hasOKBAdminAccess() == false ? "disabled" : "")
     81        ">
     82        @if ( Model.User.hasOKBAdminAccess())
     83            {
     84            <a asp-controller="OkbManagement"
     85               asp-action="Index"
     86               accesskey="q">
     87                OKB management
     88            </a>
     89        }
     90        else
     91        {
     92            <a>OKB management</a>
     93        }
     94
     95    </li>
     96    <li role="presentation"
    7997        class="pull-right ">
    8098       

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Groups.cshtml

    r13860 r13862  
    55<div class="animated fadeIn">
    66
    7     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
     7    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
    88
    99    <ul class="nav nav-pills nav-justified">

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml

    r13860 r13862  
    44<div class="animated fadeIn">
    55
    6     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
     6    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
    77
    88    <ul class="nav nav-pills nav-justified">

  • branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Roles.cshtml

    r13860 r13862  
    55<div class="animated fadeIn">
    66
    7     @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
     7    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
    88
    99    <ul class="nav nav-pills nav-justified">
Note: See TracChangeset for help on using the changeset viewer.