struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject struts-examples git commit: Use relative URL's to views
Date Fri, 09 Oct 2015 11:14:50 GMT
Repository: struts-examples
Updated Branches:
  refs/heads/master ddd45ff49 -> b6e7fbe87


Use relative URL's to views


Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/b6e7fbe8
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/b6e7fbe8
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/b6e7fbe8

Branch: refs/heads/master
Commit: b6e7fbe874fc78f56361a9c3a49485f29406b886
Parents: ddd45ff
Author: Johannes Geppert <jogep@apache.org>
Authored: Fri Oct 9 13:14:48 2015 +0200
Committer: Johannes Geppert <jogep@apache.org>
Committed: Fri Oct 9 13:14:48 2015 +0200

----------------------------------------------------------------------
 rest-angular/src/main/webapp/WEB-INF/content/index.jsp  | 4 ++--
 rest-angular/src/main/webapp/partials/order-detail.html | 2 +-
 rest-angular/src/main/webapp/partials/order-form.html   | 2 +-
 rest-angular/src/main/webapp/partials/orders.html       | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/b6e7fbe8/rest-angular/src/main/webapp/WEB-INF/content/index.jsp
----------------------------------------------------------------------
diff --git a/rest-angular/src/main/webapp/WEB-INF/content/index.jsp b/rest-angular/src/main/webapp/WEB-INF/content/index.jsp
index 97d59ca..1817e6e 100644
--- a/rest-angular/src/main/webapp/WEB-INF/content/index.jsp
+++ b/rest-angular/src/main/webapp/WEB-INF/content/index.jsp
@@ -35,8 +35,8 @@
             </div>
             <div id="navbar" class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a href="/orders">Home</a></li>
-                    <li><a href="/order/new">{{'order.new' | translate}}</a></li>
+                    <li><a href="orders">Home</a></li>
+                    <li><a href="order/new">{{'order.new' | translate}}</a></li>
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
                     <li ng-class="{'active': lang == 'en'}"><a ng-click="app.switchLanguage('en')">EN</a></li>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/b6e7fbe8/rest-angular/src/main/webapp/partials/order-detail.html
----------------------------------------------------------------------
diff --git a/rest-angular/src/main/webapp/partials/order-detail.html b/rest-angular/src/main/webapp/partials/order-detail.html
index a9c26fa..fbd9b7f 100644
--- a/rest-angular/src/main/webapp/partials/order-detail.html
+++ b/rest-angular/src/main/webapp/partials/order-detail.html
@@ -16,7 +16,7 @@
         <td class="span9">{{vm.order.amount}}</td>
     </tr>
 </table>
-<a href="/orders" class="btn btn-info">
+<a href="orders" class="btn btn-info">
     <span class="glyphicon glyphicon-arrow-left"></span> {{'orders.back' | translate}}
 </a>
 

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/b6e7fbe8/rest-angular/src/main/webapp/partials/order-form.html
----------------------------------------------------------------------
diff --git a/rest-angular/src/main/webapp/partials/order-form.html b/rest-angular/src/main/webapp/partials/order-form.html
index 4c16117..842e54a 100644
--- a/rest-angular/src/main/webapp/partials/order-form.html
+++ b/rest-angular/src/main/webapp/partials/order-form.html
@@ -40,7 +40,7 @@
     <table>
 </form>
 
-<a href="/orders" class="btn btn-info">
+<a href="orders" class="btn btn-info">
     <span class="glyphicon glyphicon-arrow-left"></span> {{'orders.back' | translate}}
 </a>
 

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/b6e7fbe8/rest-angular/src/main/webapp/partials/orders.html
----------------------------------------------------------------------
diff --git a/rest-angular/src/main/webapp/partials/orders.html b/rest-angular/src/main/webapp/partials/orders.html
index f5b6825..74d5c08 100644
--- a/rest-angular/src/main/webapp/partials/orders.html
+++ b/rest-angular/src/main/webapp/partials/orders.html
@@ -14,12 +14,12 @@
         <td>{{order.amount}}</td>
         <td>
             <div class="btn-group">
-                <a href="/order/{{order.id}}" class="btn btn-default"><span class="glyphicon
glyphicon-eye-open"></span> {{'orders.view' | translate}}</a>
-                <a href="/order/{{order.id}}/edit" class="btn btn-default"><span
class="glyphicon glyphicon-edit"></span> {{'orders.edit' | translate}}</a>
+                <a href="order/{{order.id}}" class="btn btn-default"><span class="glyphicon
glyphicon-eye-open"></span> {{'orders.view' | translate}}</a>
+                <a href="order/{{order.id}}/edit" class="btn btn-default"><span
class="glyphicon glyphicon-edit"></span> {{'orders.edit' | translate}}</a>
                 <a ng-click="vm.deleteOrder(order)" class="btn btn-danger"><span
class="glyphicon glyphicon-trash"></span> {{'orders.delete' | translate}}</a>
             </div>
         </td>
     </tr>
 </table>
 
-<a href="/order/new" class="btn btn-primary"><span class="glyphicon glyphicon-file"></span>
{{'orders.new' | translate}}</a>
+<a href="order/new" class="btn btn-primary"><span class="glyphicon glyphicon-file"></span>
{{'orders.new' | translate}}</a>


Mime
View raw message