Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/02/15 13:16:18 (9 years ago)
Author:
gkronber
Message:

#2434 merged r12878:12927 from trunk to branch (hive changes)

Location:
branches/crossvalidation-2434
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/crossvalidation-2434

  • branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3

    • Property svn:ignore

      •  

        old new  
        11Bin
         2HeuristicLab.Services.WebApp-3.3.csproj.user

  • branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml

    r12583 r12931  
    2828                <div class="panel-body">
    2929                    <p><strong>Support</strong>: <a href="App/RedirectUrl?url=http://groups.google.com/group/heuristiclab">HeuristicLab Google Group</a></p>
    30                     <p><strong>Inquiries</strong>: ​<a ng-click="mailToSupport()">support(at)heuristiclab.com</a></p>
     30                    <p><strong>Inquiries</strong>: ​<a class="cursor-pointer" ng-click="mailToSupport()">support(at)heuristiclab.com</a></p>
    3131                    <p><strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong>: <a href="App/RedirectUrl?url=http://heal.heuristiclab.com">​http://heal.heuristiclab.com</a></p>
    3232                    <p><strong>HeuristicLab development site</strong>: <a href="App/RedirectUrl?url=http://dev.heuristiclab.com">http://dev.heuristiclab.com</a></p>
    … …  
    3636                        <span class="glyphicon glyphicon-phone-alt"></span> +43 50804 22030<br />
    3737                        <span class="glyphicon glyphicon-print"></span> +43 50804 21599<br />
    38                         <span class="glyphicon glyphicon-envelope"></span> <a ng-click="mailToStefanWagner()">stefan.wagner(at)heuristiclab.com</a><br />
     38                        <span class="glyphicon glyphicon-envelope"></span> <a class="cursor-pointer" ng-click="mailToStefanWagner()">stefan.wagner(at)heuristiclab.com</a><br />
    3939                    </p>
    4040                </div>

  • branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/login/login.cshtml

    r12428 r12931  
    1414                            <div class="input-group">
    1515                                <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
    16                                 <input type="text" class="form-control" name="Username" placeholder="User"
     16                                <input type="text" class="form-control" name="Username" placeholder="Username"
    1717                                       ng-model="user.Username">
    1818                            </div>

  • branches/crossvalidation-2434/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/plugins.cshtml

    r12557 r12931  
    2121                                <th>#</th>
    2222                                <th ts-criteria="Name">Name</th>
    23                                 <th ts-criteria ="AssemblyName">Assembly</th>
     23                                <th ts-criteria="AssemblyName">Assembly</th>
    2424                                <th ts-criteria="LastReload">Last reload</th>
    25                                 <th>Status</th>
     25                                <th class="text-center">Status</th>
    2626                                <th></th>
    2727                            </tr>
    … …  
    3333                                <td>{{plugin.AssemblyName}}</td>
    3434                                <td>{{plugin.LastReload}}</td>
    35                                 <td>
     35                                <td class="text-center">
    3636                                    <span ng-hide="plugin.Exception" class="glyphicon glyphicon glyphicon-ok" style="color: green"></span>
    3737                                    <span ng-show="plugin.Exception" class="glyphicon glyphicon glyphicon-remove" style="color: darkred"
    … …  
    3939                                </td>
    4040                                <td>
    41                                     <a ng-href="" data-ng-click="reloadPlugin(plugin.Name)">Reload</a>
     41                                    <a ng-href="" class="cursor-pointer" data-ng-click="reloadPlugin(plugin.Name)">Reload</a>
    4242                                </td>
    4343                            </tr>
Note: See TracChangeset for help on using the changeset viewer.