Changeset 12556


Ignore:
Timestamp:
06/30/15 15:45:29 (4 years ago)
Author:
dglaser
Message:

#2394:

HeuristicLab.Services.WebApp-3.3:

  • changed login error message
  • updated about page
Location:
trunk/sources/HeuristicLab.Services.WebApp/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs

    r12435 r12556  
    4747    }
    4848
     49    public ActionResult RedirectUrl(string url) {
     50      return RedirectPermanent(url);
     51    }
    4952  }
    5053}
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml

    r12546 r12556  
    88                <div class="panel-body">
    99                    <p>
    10                         Heuristic and Evolutionary Algorithms Laboratory (HEAL)<br />
     10                        <strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong><br />
    1111                        School of Informatics, Communications and Media<br />
    1212                        University of Applied Sciences Upper Austria<br />
     
    2727                </div>
    2828                <div class="panel-body">
    29                     <p><strong>Support and Inquiries</strong>: ​<a href="mailto:#">support@heuristiclab.com</a></p>
    30                     <p><strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong>: <a href="​http://heal.heuristiclab.com">​http://heal.heuristiclab.com</a></p>
     29                    <p><strong>Support and Inquiries</strong>: ​<a href="mailto:support@heuristiclab.com">support@heuristiclab.com</a></p>
     30                    <p><strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong>: <a href="App/RedirectUrl?url=http://heal.heuristiclab.com">​http://heal.heuristiclab.com</a></p>
     31                    <p><strong>HeuristicLab development site</strong>: <a href="App/RedirectUrl?url=http://dev.heuristiclab.com">http://dev.heuristiclab.com</a></p>
    3132                    <p>
    32                         <strong>Head of HeuristicLab</strong>:<br />
     33                        <strong>Head of HeuristicLab</strong>: <br />
    3334                        FH-Prof. DI Dr. Stefan Wagner<br />
    34                         Phone: +43 50804 22030<br />
    35                         Fax: +43 50804 21599<br />
    36                         E-mail: <a href="mailto:#">stefan.wagner@heuristiclab.com</a><br />
     35                        <span class="glyphicon glyphicon-phone-alt"></span> +43 50804 22030<br />
     36                        <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 />
    3738                    </p>
    3839                </div>
     
    4546            <div class="panel panel-default">
    4647                <div class="panel-heading">
    47                     <h3 class="panel-title">Disclaimer of Liability and Endorsement</h3>
     48                    <h3 class="panel-title">Disclaimer</h3>
    4849                </div>
    4950                <div class="panel-body">
    50                     <p style="text-align:justify">HeuristicLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details (http://www.gnu.org/licenses). All contents on the development homepage and wiki of the HeuristicLab have been compiled carefully. Still, the Heuristic and Evolutionary Algorithms Laboratory (HEAL) makes no guarantees of accuracy, completeness and timeliness of the information on this website. Therefore HEAL accepts no responsibility or liability for damages or losses resulting from the use of this website and/or the software.</p>
     51                    <p style="text-align: justify">HeuristicLab, Hive and HeuristicLab WebApp are distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details (<a href="App/RedirectUrl?url=http://www.gnu.org/licenses">http://www.gnu.org/licenses</a>). </p>
    5152                </div>
    5253            </div>
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/login/loginCtrl.js

    r12428 r12556  
    99                        $window.location.reload();
    1010                    } else {
    11                         $scope.result = "error logging in";
     11                        $scope.result = "Invalid username or password. Please try again.";
    1212                    }
    1313                });
Note: See TracChangeset for help on using the changeset viewer.