chg: extract url to links.txt

fixes issue #26

Change-Id: I8c5521bf3daaf203b390f2059a0cafb56c79c028

diff --git a/links.txt b/links.txt
index e68f4e90053cb94d2d367c7b8d0760ba638cf6ba..ec99a4d8e455d27067a107abd99aac332af9e05d 100644 (file)
--- a/links.txt
+++ b/links.txt
@@ -15,3 +15,4 @@
 /ttp/country
 /blog
 /imprint
+/isocode http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm

diff --git a/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ b/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ
index 7fdd98deeb63be2e4a8d20c016d06dc11adc771f..865f8ddead483b0e570194c21a44871476354c2a 100644 (file)
--- a/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ
+++ b/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ
@@ -28,7 +28,7 @@
     <td><?=_Country?>:</td>
     <td>
       <?=$C?>
-      <?=_(2 letter !'<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">'ISO code!'</a>')?>
+      <?=_(2 letter !(/isocode)ISO code!'</a>')?>
     </td>
   </tr>
   <? if($edit) { ?>

diff --git a/src/club/wpia/gigi/pages/orga/CreateOrgPage.java b/src/club/wpia/gigi/pages/orga/CreateOrgPage.java
index 4eab3d6e274dcb79ba319e14fd2f9cea07a86eda..98076fe94dd347c5fbf13ada4d984c9cfd895acb 100644 (file)
--- a/src/club/wpia/gigi/pages/orga/CreateOrgPage.java
+++ b/src/club/wpia/gigi/pages/orga/CreateOrgPage.java
@@ -1,7 +1,6 @@
 package club.wpia.gigi.pages.orga;
 
 import java.io.IOException;
-import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -27,6 +26,6 @@ public class CreateOrgPage extends ManagedFormPage {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        new CreateOrgForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        new CreateOrgForm(req).output(resp.getWriter(), getLanguage(req), getDefaultVars(req));
     }
 }

diff --git a/src/club/wpia/gigi/pages/orga/ViewOrgPage.java b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
index d676c1de567977e9fa08a17b2a41258d5bb91a2c..909f9efe62168bd22fe422e0d67a70b4c4dcefa3 100644 (file)
--- a/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
+++ b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
@@ -13,11 +13,12 @@ import club.wpia.gigi.dbObjects.Organisation;
 import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.template.Form;
+import club.wpia.gigi.output.template.Form.CSRFException;
 import club.wpia.gigi.output.template.IterableDataset;
 import club.wpia.gigi.output.template.Template;
-import club.wpia.gigi.output.template.Form.CSRFException;
 import club.wpia.gigi.pages.LoginPage;
 import club.wpia.gigi.pages.ManagedMultiFormPage;
+import club.wpia.gigi.pages.Page;
 import club.wpia.gigi.pages.account.domain.DomainManagementForm;
 import club.wpia.gigi.util.AuthorizationContext;
 
@@ -91,7 +92,7 @@ public class ViewOrgPage extends ManagedMultiFormPage {
             resp.sendError(404);
             return;
         }
-        HashMap<String, Object> vars = new HashMap<>();
+        Map<String, Object> vars = Page.getDefaultVars(req);
         if (orgAss) {
             vars.put("editForm", new CreateOrgForm(req, o));
             vars.put("affForm", new AffiliationForm(req, o));