Changeset 12583


Ignore:
Timestamp:
07/03/15 14:59:19 (4 years ago)
Author:
dglaser
Message:

#2413:

HeuristicLab.Services.WebApp-3.3:

  • Added CryptoJS Library
  • Changed about page
  • Obfuscated emails

HeuristicLab.Services.WebApp.Status-3.3:

  • Added QuickSelection to Status History page
Location:
trunk/sources
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml

    r12519 r12583  
    2424            <label for="fromDate">To:&nbsp;</label>
    2525            <div class="input-group">
    26                 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="toDate" is-open="toIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close" />
     26                <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="toDate" is-open="toIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close"/>
    2727                <span class="input-group-btn">
    2828                    <button type="button" class="btn btn-default" ng-click="openToDateSelection($event)"><i class="glyphicon glyphicon-calendar"></i></button>
    2929                </span>
     30            </div>
     31        </div>
     32        <div class="form-group" style="margin-left: 5px; margin-right: 5px;">
     33            <div class="btn-group" dropdown dropdown-append-to-body>
     34                <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle style="width: 130px; text-align: left;">
     35                    {{curQuickSelection.name}} <span class="glyphicon glyphicon-chevron-down" style="margin-top: 3px; float:right"></span>
     36                </button>
     37                <ul class="dropdown-menu" role="menu">
     38                    <li ng-repeat="quickSelection in quickSelectionList">
     39                        <a ng-click="changeQuickSelection(quickSelection)">{{quickSelection.name}}</a>
     40                    </li>
     41                </ul>
    3042            </div>
    3143        </div>
  • trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js

    r12521 r12583  
    4747            $scope.toIsOpen = false;
    4848
     49            $scope.quickSelectionList = [
     50                { id: 0, name: 'Custom' },
     51                { id: 1, name: 'Today' },
     52                { id: 2, name: 'Yesterday' },
     53                { id: 3, name: 'Last 7 Days' },
     54                { id: 4, name: 'Last 30 Days' }
     55            ];
     56            $scope.changeQuickSelection = function (quickSelection) {
     57                var today = new Date();
     58                var oneDayInMs = 24 * 60 * 60 * 1000;
     59                switch (quickSelection.id) {
     60                    case 1:
     61                        $scope.fromDate = new Date(today.valueOf());
     62                        $scope.toDate = new Date(today.valueOf());
     63                        break;
     64                    case 2:
     65                        $scope.fromDate = new Date(today.valueOf() - oneDayInMs);
     66                        $scope.toDate = new Date(today.valueOf() - oneDayInMs);
     67                        break;
     68                    case 3:
     69                        $scope.fromDate = new Date(today.valueOf() - (7 * oneDayInMs));
     70                        $scope.toDate = new Date(today.valueOf());
     71                        break;
     72                    case 4:
     73                        $scope.fromDate = new Date(today.valueOf() - (30 * oneDayInMs));
     74                        $scope.toDate = new Date(today.valueOf());
     75                        break;
     76                }
     77                $scope.curQuickSelection = quickSelection;
     78            };
     79            // set default 'today'
     80            $scope.changeQuickSelection($scope.quickSelectionList[1]);
     81
    4982            $scope.openFromDateSelection = function ($event) {
    5083                $event.preventDefault();
     
    5285                $scope.toIsOpen = false;
    5386                $scope.fromIsOpen = true;
     87                $scope.curQuickSelection = $scope.quickSelectionList[0];
    5488            };
    5589
     
    5993                $scope.fromIsOpen = false;
    6094                $scope.toIsOpen = true;
     95                $scope.curQuickSelection = $scope.quickSelectionList[0];
    6196            };
    6297
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

    r12557 r12583  
    5959        // bootstrap
    6060        "~/WebApp/libs/bootstrap/js/bootstrap.min.js",
     61        // crypto js
     62        "~/WebApp/libs/cryptojs/aes.js",
    6163        // angular js
    6264        "~/WebApp/libs/angularjs/angular.min.js",
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/helper.js

    r12428 r12583  
    4444    return day + '.' + month + '.' + year + ' ' + hour + ':' + minute + ':' + second;
    4545};
     46
     47var decryptString = function(s) {
     48    return CryptoJS.AES.decrypt(s, "heuristiclab").toString(CryptoJS.enc.Utf8);
     49};
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml

    r12556 r12583  
    2727                </div>
    2828                <div class="panel-body">
    29                     <p><strong>Support and Inquiries</strong>: ​<a href="mailto:support@heuristiclab.com">support@heuristiclab.com</a></p>
     29                    <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>
    3031                    <p><strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong>: <a href="App/RedirectUrl?url=http://heal.heuristiclab.com">​http://heal.heuristiclab.com</a></p>
    3132                    <p><strong>HeuristicLab development site</strong>: <a href="App/RedirectUrl?url=http://dev.heuristiclab.com">http://dev.heuristiclab.com</a></p>
     
    3536                        <span class="glyphicon glyphicon-phone-alt"></span> +43 50804 22030<br />
    3637                        <span class="glyphicon glyphicon-print"></span> +43 50804 21599<br />
    37                         <span class="glyphicon glyphicon-envelope"></span> <a href="mailto:stefan.wagner@heuristiclab.com">stefan.wagner@heuristiclab.com</a><br />
     38                        <span class="glyphicon glyphicon-envelope"></span> <a ng-click="mailToStefanWagner()">stefan.wagner(at)heuristiclab.com</a><br />
    3839                    </p>
    3940                </div>
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/aboutCtrl.js

    r12546 r12583  
    11(function () {
    22    var module = appAboutPlugin.getAngularModule();
    3     module.controller('app.about.ctrl', ['$scope', function ($scope) { }]);
     3    module.controller('app.about.ctrl', ['$scope', function($scope) {
     4        $scope.mailToSupport = function () {
     5            location.href = decryptString('U2FsdGVkX1/pCOITUzzsN36hx4sHh11FeVXkVyQ5b2KeZebFQ3KaNN8G9bKL3lU9');
     6        };
     7
     8        $scope.mailToStefanWagner = function () {
     9            location.href = decryptString('U2FsdGVkX1/Lzu8UFltiBl6VmBf9E0lmGna0+7o7cavCPwiCytBpSLsJoyhO9tl5hHCvJPVgsSndWdmGEuWrXw==');
     10        };
     11    }]);
    412})();
Note: See TracChangeset for help on using the changeset viewer.