diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2015-04-19 13:47:08 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2015-04-19 13:47:08 +0200 |
| commit | db8511e5081747ebddc4f16303a9c7fe44bb313e (patch) | |
| tree | bec298c872f6e04569be41300d8d7b4f2da993d3 | |
| parent | 7fd19157644534d004a5ef4ca450fa7a3d3eb4b0 (diff) | |
| download | aCms-db8511e5081747ebddc4f16303a9c7fe44bb313e.tar.gz aCms-db8511e5081747ebddc4f16303a9c7fe44bb313e.tar.bz2 | |
some text changes
| -rw-r--r-- | media/basic-profile.css | 2 | ||||
| -rw-r--r-- | src/master_content.hpp | 4 | ||||
| -rw-r--r-- | templates/intro.tmpl | 4 | ||||
| -rw-r--r-- | templates/logout.tmpl | 5 | ||||
| -rw-r--r-- | templates/master.tmpl | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/media/basic-profile.css b/media/basic-profile.css index 5ebcaf3..c102585 100644 --- a/media/basic-profile.css +++ b/media/basic-profile.css @@ -5,7 +5,7 @@ For more information, see http://andreasviklund.com/templates/basic-profile/ *{margin:0; padding:0;}
body {background:#fff top center no-repeat; color:#303030; font:84% Arial,Helvetica,sans-serif; line-height:1.6em;}
-a {color:#0B0B61; text-decoration:none;}
+a {color:#0B0B61; text-decoration:none; font-weight: bold;}
a:hover {text-decoration:underline;}
p,ul,ol,dl {margin:0 0 30px 0;}
h1 {color:#888; font-size:3.2em; line-height:1.1em; letter-spacing:-3px; margin:20px 0 0 0;}
diff --git a/src/master_content.hpp b/src/master_content.hpp index ff40b09..23db633 100644 --- a/src/master_content.hpp +++ b/src/master_content.hpp @@ -28,6 +28,10 @@ struct master : public cppcms::base_content { login_link = "/strusCms/login"; logout_link = "/strusCms/logout"; } + + std::string root( ) { + return "/strusCms"; + } }; } diff --git a/templates/intro.tmpl b/templates/intro.tmpl index 0fd4c35..205f952 100644 --- a/templates/intro.tmpl +++ b/templates/intro.tmpl @@ -8,11 +8,11 @@ <% template page_content() %> <div> - Welcome to <b>StrusCms</b>. + Welcome to "StrusCms". </div> <div> <% if not empty username %> - After oyou finished editing pages, please log out + After you have finished editing pages, please log out <a href="<%= logout_link %>">here</a>. <% else %> If you want to edit pages, please log in diff --git a/templates/logout.tmpl b/templates/logout.tmpl index 2ce7816..c867e73 100644 --- a/templates/logout.tmpl +++ b/templates/logout.tmpl @@ -18,6 +18,11 @@ <div> Otherwise contacting the developers is possible via email directly. </div> + + <div> + If you want to edit pages again, you can of course log in + <a href="<%= login_link %>">here</a>. + </div> <% end template %> <% end view %> diff --git a/templates/master.tmpl b/templates/master.tmpl index 7330ef1..6a42731 100644 --- a/templates/master.tmpl +++ b/templates/master.tmpl @@ -17,7 +17,7 @@ <div id="sidebar"> <img src="/media/images/strus_big.jpg" width="280" height="280" alt="Strus logo" /></a> - <h1><a href="index.htm">Strus CMS</a></h1> + <h1><a href="<%= root() %>">Strus CMS</a></h1> <p class="slogan">A simple demo CMS showing the power of the following software:</p> <ul> <li><a href="http://project-strus.net">Strus</a><br/>a collection of C++ libraries for building a full-text search engine</li> |