aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Chabowski <kevin@kch42.de>2012-02-28 00:29:50 +0100
committerKevin Chabowski <kevin@kch42.de>2012-02-28 00:29:50 +0100
commita940213bc467fce611854002e15b05fef5a0d3c8 (patch)
treec6312d99ba2de1aec44e62dfd32f083f1bdad5fc
parentb10a73f0c1cedb67a43d515caaac3d383d8d2368 (diff)
downloadratatoeskr-cms-a940213bc467fce611854002e15b05fef5a0d3c8.tar.gz
ratatoeskr-cms-a940213bc467fce611854002e15b05fef5a0d3c8.tar.bz2
ratatoeskr-cms-a940213bc467fce611854002e15b05fef5a0d3c8.zip
Default repositories will be configured during setup now.
Also: Beta 2
-rwxr-xr-xratatoeskr/templates/src/systemtemplates/backend_login.html2
-rwxr-xr-xratatoeskr/templates/src/systemtemplates/master.html2
-rw-r--r--ratatoeskr/templates/src/systemtemplates/setup_done.html5
-rw-r--r--ratatoeskr/translations/de.php1
-rw-r--r--ratatoeskr/translations/en.php1
5 files changed, 9 insertions, 2 deletions
diff --git a/ratatoeskr/templates/src/systemtemplates/backend_login.html b/ratatoeskr/templates/src/systemtemplates/backend_login.html
index 128c9e7..bf7c1fc 100755
--- a/ratatoeskr/templates/src/systemtemplates/backend_login.html
+++ b/ratatoeskr/templates/src/systemtemplates/backend_login.html
@@ -9,7 +9,7 @@
<body>
<img id="background_image" src="$rel_path_to_root/ratatoeskr/cms_style/images/login_bg.jpg" alt="" />
<div id="main">
- <div id="bar_top"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.1 &beta;)</div>
+ <div id="bar_top"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.1 &beta; 2)</div>
<div class="vcenter_outer"><div class="vcenter_inner">
<div id="login_box">
<h1><ste:get_translation for="login_form_header" /></h1>
diff --git a/ratatoeskr/templates/src/systemtemplates/master.html b/ratatoeskr/templates/src/systemtemplates/master.html
index 93cdd97..793803e 100755
--- a/ratatoeskr/templates/src/systemtemplates/master.html
+++ b/ratatoeskr/templates/src/systemtemplates/master.html
@@ -31,7 +31,7 @@
</head>
<body>
<div id="bar_top">
- <span class="branding"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.1 &beta;)</span>
+ <span class="branding"><strong>Ratatöskr</strong>::Noctilucent clouds (v. 0.1 &beta; 2)</span>
<span class="user">
<a href="$rel_path_to_root/backend/admin/users/u/$user[id]">$user[name]</a> | <a href="$rel_path_to_root/backend/logout"><ste:get_translation for="logout" /></a>
</span>
diff --git a/ratatoeskr/templates/src/systemtemplates/setup_done.html b/ratatoeskr/templates/src/systemtemplates/setup_done.html
index e21efca..c79a212 100644
--- a/ratatoeskr/templates/src/systemtemplates/setup_done.html
+++ b/ratatoeskr/templates/src/systemtemplates/setup_done.html
@@ -1,5 +1,10 @@
<ste:load name="setup_master.html" />
<ste:block name="content">
+ <ste:if>$notice
+ <ste:then>
+ <div class="notice">$notice</div>
+ </ste:then>
+ </ste:if>
<h2><ste:get_translation for="setup_almost_done" /></h2>
<p><ste:get_translation for="setup_configfile_instructions" /></p>
diff --git a/ratatoeskr/translations/de.php b/ratatoeskr/translations/de.php
index 3629ce1..bc18a03 100644
--- a/ratatoeskr/translations/de.php
+++ b/ratatoeskr/translations/de.php
@@ -261,6 +261,7 @@ $translation = array(
"enforce" => "Erzwingen",
"could_not_activate_plugin_api_incompat" => "Konnte diese Plugins nicht aktivieren, da sie nicht (mehr) mit deiner Ratatöskr-Installation kompatibel sind: [[PLUGINS]]",
"plugins_incompat" => "Diese Plugins sind nicht (mehr) mit deiner Ratatöskr-Installation kompatibel: [[PLUGINS]]",
+ "could_not_initialize_repos" => "Setup ist abgeschlossen, allerdings konnten die Standard-Repositories nicht initalisiert werden.",
/* Very long texts here */
"linking_back_hint" => <<<LINKINGBACK
<h2>Verlinken auf die Seitenwurzel</h2>
diff --git a/ratatoeskr/translations/en.php b/ratatoeskr/translations/en.php
index 671a909..2d61ad7 100644
--- a/ratatoeskr/translations/en.php
+++ b/ratatoeskr/translations/en.php
@@ -261,6 +261,7 @@ $translation = array(
"enforce" => "Enforce",
"could_not_activate_plugin_api_incompat" => "Could not activate these plugins, because they are not / no longer compatible with your Ratatöskr-installation: [[PLUGINS]]",
"plugins_incompat" => "These plugins are not / no longer compatible with your Ratatöskr -installation: [[PLUGINS]]",
+ "could_not_initialize_repos" => "Setup is completed, but the default repositories could not be initalized.",
/* Very long texts here */
"linking_back_hint" => <<<LINKINGBACK
<h2>Linking back</h2>