Changeset 12685 for stable/HeuristicLab.Services.WebApp/3.3

Timestamp:

07/08/15 14:10:49 (9 years ago)

Author:

ascheibe

Message:

#2413 merged r12583 and r12666 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/WebApp/helper.js (modified) (1 diff)
• HeuristicLab.Services.WebApp/3.3/WebApp/libs/cryptojs (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/libs/cryptojs)
• HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml (modified) (2 diffs)
• HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/aboutCtrl.js (modified) (1 diff)

stable/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

@@ -59 +59 @@
         // bootstrap
         "~/WebApp/libs/bootstrap/js/bootstrap.min.js",
+        // crypto js
+        "~/WebApp/libs/cryptojs/aes.js",
         // angular js
         "~/WebApp/libs/angularjs/angular.min.js",

stable/HeuristicLab.Services.WebApp/3.3/WebApp/helper.js

@@ -44 +44 @@
     return day + '.' + month + '.' + year + ' ' + hour + ':' + minute + ':' + second;
 };
+
+var decryptString = function(s) {
+    return CryptoJS.AES.decrypt(s, "heuristiclab").toString(CryptoJS.enc.Utf8);
+};

stable/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml

@@ -27 +27 @@
                 </div>
                 <div class="panel-body">
-                    <p><strong>Support and Inquiries</strong>: ​<a href="mailto:support@heuristiclab.com">support@heuristiclab.com</a></p>
+                    <p><strong>Support</strong>: <a href="App/RedirectUrl?url=http://groups.google.com/group/heuristiclab">HeuristicLab Google Group</a></p>
+                    <p><strong>Inquiries</strong>: ​<a ng-click="mailToSupport()">support(at)heuristiclab.com</a></p>
                     <p><strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong>: <a href="App/RedirectUrl?url=http://heal.heuristiclab.com">​http://heal.heuristiclab.com</a></p>
                     <p><strong>HeuristicLab development site</strong>: <a href="App/RedirectUrl?url=http://dev.heuristiclab.com">http://dev.heuristiclab.com</a></p>
@@ -35 +36 @@
                         <span class="glyphicon glyphicon-phone-alt"></span> +43 50804 22030<br />
                         <span class="glyphicon glyphicon-print"></span> +43 50804 21599<br />
-                        <span class="glyphicon glyphicon-envelope"></span> <a href="mailto:stefan.wagner@heuristiclab.com">stefan.wagner@heuristiclab.com</a><br />
+                        <span class="glyphicon glyphicon-envelope"></span> <a ng-click="mailToStefanWagner()">stefan.wagner(at)heuristiclab.com</a><br />
                     </p>
                 </div>

stable/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/aboutCtrl.js

@@ -1 +1 @@
 (function () {
     var module = appAboutPlugin.getAngularModule();
-    module.controller('app.about.ctrl', ['$scope', function ($scope) { }]);
+    module.controller('app.about.ctrl', ['$scope', function($scope) {
+        $scope.mailToSupport = function () {
+            location.href = decryptString('U2FsdGVkX1/pCOITUzzsN36hx4sHh11FeVXkVyQ5b2KeZebFQ3KaNN8G9bKL3lU9');
+        };
+
+        $scope.mailToStefanWagner = function () {
+            location.href = decryptString('U2FsdGVkX1/Lzu8UFltiBl6VmBf9E0lmGna0+7o7cavCPwiCytBpSLsJoyhO9tl5hHCvJPVgsSndWdmGEuWrXw==');
+        };
+    }]);
 })();