Mobile: templates nach templates/mobile_webpages verschoben

diff --git a/SL/Layout/Material.pm b/SL/Layout/Material.pm
index c683172..78afd26 100644 (file)
--- a/SL/Layout/Material.pm
+++ b/SL/Layout/Material.pm
@@ -13,6 +13,10 @@ sub get_stylesheet_for_user {
   'css/material';
 }
 
+sub webpages_path {
+  "templates/mobile_webpages";
+}
+
 sub init_sub_layouts {
   [
     SL::Layout::None->new,

diff --git a/SL/Layout/MaterialMenu.pm b/SL/Layout/MaterialMenu.pm
index 4ae4da3..e8ef3b8 100644 (file)
--- a/SL/Layout/MaterialMenu.pm
+++ b/SL/Layout/MaterialMenu.pm
@@ -10,7 +10,7 @@ sub init_menu {
 }
 
 sub pre_content {
-  $_[0]->presenter->render('menu/material', menu => $_[0]->menu, C => SL::Controller::Base->new);
+  $_[0]->presenter->render('menu/menu', menu => $_[0]->menu, C => SL::Controller::Base->new);
 }
 
 1;

diff --git a/SL/Layout/MobileLogin.pm b/SL/Layout/MobileLogin.pm
index 91a010e..54277df 100644 (file)
--- a/SL/Layout/MobileLogin.pm
+++ b/SL/Layout/MobileLogin.pm
@@ -10,6 +10,10 @@ sub get_stylesheet_for_user {
   'css/material';
 }
 
+sub webpages_path {
+  "templates/mobile_webpages"
+}
+
 sub init_sub_layouts {
   [
     SL::Layout::None->new,

diff --git a/templates/mobile_webpages/generic/exception.html b/templates/mobile_webpages/generic/exception.html
new file mode 100644 (file)
index 0000000..47b1060
--- /dev/null
+++ b/templates/mobile_webpages/generic/exception.html
@@ -0,0 +1,22 @@
+[%- USE LxERP %]
+[%- USE HTML %]
+
+ <h1 class="message_error">[%- LxERP.t8('Error!') %]</h1>
+
+ <p>
+  [%- LxERP.t8('An exception occurred during execution.') %]
+ </p>
+
+ <div>
+  <table>
+   <tr>
+    <td valign="top">[%- LxERP.t8('Type') %]:</td>
+    <td valign="top">[%- HTML.escape(error.type) %]</td>
+   </tr>
+
+   <tr>
+    <td valign="top">[%- LxERP.t8('Information') %]:</td>
+    <td valign="top"><pre>[%- HTML.escape(error.info) %]</pre></td>
+   </tr>
+  </table>
+ </div>

diff --git a/templates/mobile_webpages/generic/information.html b/templates/mobile_webpages/generic/information.html
new file mode 100644 (file)
index 0000000..5f4230f
--- /dev/null
+++ b/templates/mobile_webpages/generic/information.html
@@ -0,0 +1,3 @@
+[%- USE T8 %]
+<div class="message_ok">[% IF title_information %][% title_information %][% ELSE %][% 'Information' | $T8 %][% END %]</div>
+<p>[% label_information %]</p>

diff --git a/templates/mobile_webpages/login/company_logo.html b/templates/mobile_webpages/login/company_logo.html
new file mode 100644 (file)
index 0000000..472d479
--- /dev/null
+++ b/templates/mobile_webpages/login/company_logo.html
@@ -0,0 +1,47 @@
+[%- USE T8 %]
+[%- USE HTML %][%- USE LxERP %]
+ <center>
+  <a class="nomobile" href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo[% xmas %].png" class='kivitendo-logo' border="0" alt='[% 'kivitendo' | $T8 %]' title="[% 'kivitendo Homepage' | $T8 %]"></a>
+
+  <h3 class="login">[% 'kivitendo' | $T8 %] [% version %]</h3>
+
+[%- IF git_head %]
+  <p>[%- LxERP.t8("Git revision: #1, #2 #3", git_head.hash.substr(0, 7), git_head.author_date.to_kivitendo, git_head.author_date.strftime('%H:%M:%S %Z')) %]</p>
+[%- END %]
+
+  <p>[% 'companylogo_subtitle' | $T8 %]</p>
+  <p>
+   <b>
+    [% HTML.escape(defaults.company) %]
+    <br>
+    [% HTML.escape(defaults.address).replace('\\\\n', '<br>').replace('\n', '<br>') %]
+   </b>
+
+   <br>
+   <br>
+
+   <table border="0">
+    <tr>
+     <th align="left"><a href="am.pl?action=config" title="[% 'Preferences' | $T8 %]">[% 'User' | $T8 %]</a></th>
+     <td>[% HTML.escape(MYCONFIG.name) %]</td>
+    </tr>
+    <tr>
+     <th align="left">[% IF AUTH.assert('admin', 'may_fail') %]<a href="controller.pl?action=ClientConfig/edit" title="[% 'Client Configuration' | $T8 %]">[% END %][% 'Client' | $T8 %][% IF AUTH.assert('admin', 'may_fail') %]</a>[% END %]</th>
+     <td>[% HTML.escape(client.name) %]</td>
+    </tr>
+    <tr>
+     <th align="left"><a href="am.pl?action=config" title="[% 'Preferences' | $T8 %]">[% 'Language' | $T8 %]</a></th>
+     <td>[% HTML.escape(MYCONFIG.countrycode) %]</td>
+    </tr>
+    <tr>
+     <th align="left">[% 'Webserver interface' | $T8 %]</th>
+     <td>[% HTML.escape(interface) %]</td>
+    </tr>
+    <tr class="nomobile">
+     <th align="left">[% 'kivitendo Homepage' | $T8 %]:</th>
+     <td><a href="http://kivitendo.de" target="_blank" title="[% 'kivitendo Homepage' | $T8 %]">http://kivitendo.de</a></td>
+    </tr>
+   </table>
+ </center>
+
+ [%- todo_list %]

diff --git a/templates/mobile_webpages/menu/menu.html b/templates/mobile_webpages/menu/menu.html
new file mode 100644 (file)
index 0000000..8650cfa
--- /dev/null
+++ b/templates/mobile_webpages/menu/menu.html
@@ -0,0 +1,39 @@
+[%- USE T8 %]
+[%- USE L %]
+[%- USE HTML %]
+[%- USE LxERP -%]
+<nav>
+  <div class="nav-wrapper">
+    <a class="brand-logo">Kivitendo</a>
+    <a href="#" data-target="nav-mobile" class="sidenav-trigger"><i class="material-icons">menu</i></a>
+    <ul id="nav" class="right hide-on-med-and-down">
+      [% PROCESS menu_items %]
+    </ul>
+  </div>
+</nav>
+
+<ul id="nav-mobile" class="sidenav">
+  [% PROCESS menu_items %]
+</ul>
+
+
+[%- BLOCK menu_items %]
+ [%- IF MYCONFIG.login %]
+  <li><a>[% 'User' | $T8 %]: [% MYCONFIG.login | html %]</a></li>
+ [%- ELSE %]
+  <li>[% L.link(C.url_for(controller='LoginScreen', action='user_login'), LxERP.t8('Login')) %]</li>
+ [%- END %]
+
+  <li><div class="divider"></div></li>
+
+  [%- FOREACH node = menu.tree %]
+    [%- NEXT UNLESS node.visible %]
+    <li>[% L.link(menu.href_for_node(node) || '#', menu.name_for_node(node), target=node.target) %]</li>
+  [%- END %]
+
+  <li><div class="divider"></div></li>
+
+ [%- IF MYCONFIG.login %]
+  <li>[% L.link(C.url_for(controller='LoginScreen', action='logout'), LxERP.t8('Logout')) %]</li>
+ [%- END %]
+[% END %]

diff --git a/templates/webpages/menu/material.html b/templates/webpages/menu/material.html
deleted file mode 100644 (file)
index 8650cfa..0000000
--- a/templates/webpages/menu/material.html
+++ /dev/null
@@ -1,39 +0,0 @@
-[%- USE T8 %]
-[%- USE L %]
-[%- USE HTML %]
-[%- USE LxERP -%]
-<nav>
-  <div class="nav-wrapper">
-    <a class="brand-logo">Kivitendo</a>
-    <a href="#" data-target="nav-mobile" class="sidenav-trigger"><i class="material-icons">menu</i></a>
-    <ul id="nav" class="right hide-on-med-and-down">
-      [% PROCESS menu_items %]
-    </ul>
-  </div>
-</nav>
-
-<ul id="nav-mobile" class="sidenav">
-  [% PROCESS menu_items %]
-</ul>
-
-
-[%- BLOCK menu_items %]
- [%- IF MYCONFIG.login %]
-  <li><a>[% 'User' | $T8 %]: [% MYCONFIG.login | html %]</a></li>
- [%- ELSE %]
-  <li>[% L.link(C.url_for(controller='LoginScreen', action='user_login'), LxERP.t8('Login')) %]</li>
- [%- END %]
-
-  <li><div class="divider"></div></li>
-
-  [%- FOREACH node = menu.tree %]
-    [%- NEXT UNLESS node.visible %]
-    <li>[% L.link(menu.href_for_node(node) || '#', menu.name_for_node(node), target=node.target) %]</li>
-  [%- END %]
-
-  <li><div class="divider"></div></li>
-
- [%- IF MYCONFIG.login %]
-  <li>[% L.link(C.url_for(controller='LoginScreen', action='logout'), LxERP.t8('Logout')) %]</li>
- [%- END %]
-[% END %]