Merge pull request #545 from chris5560/master

luci-app-radicale: remove map.title hack

diff --git a/applications/luci-app-radicale/Makefile b/applications/luci-app-radicale/Makefile
index 960618d..1501d4f 100644 (file)
--- a/applications/luci-app-radicale/Makefile
+++ b/applications/luci-app-radicale/Makefile
@@ -10,7 +10,7 @@ PKG_NAME:=luci-app-radicale
 
 # Version == major.minor.patch
 # increase "minor" on new functionality and "patch" on patches/optimization
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
 # Release == build
 # increase on changes of translation files

diff --git a/applications/luci-app-radicale/luasrc/controller/radicale.lua b/applications/luci-app-radicale/luasrc/controller/radicale.lua
index 35f5a83..10ec1fe 100644 (file)
--- a/applications/luci-app-radicale/luasrc/controller/radicale.lua
+++ b/applications/luci-app-radicale/luasrc/controller/radicale.lua
@@ -82,7 +82,7 @@ function service_ok()
 end
 
 function app_title_main()
-       return  [[</a><a href="javascript:alert(']]
+       return  [[<a href="javascript:alert(']]
                        .. I18N.translate("Version Information")
                        .. [[\n\n]] .. luci_app_name()
                        .. [[\n\t]] .. I18N.translate("Version") .. [[:\t]]
@@ -100,12 +100,14 @@ function app_title_main()
                        .. [[\n\n]]
                .. [[')">]]
                .. I18N.translate("Radicale CalDAV/CardDAV Server")
+               .. [[</a>]]
 end
 function app_title_back()
-       return  [[</a><a href="]]
+       return  [[<a href="]]
                        .. DISP.build_url("admin", "services", "radicale")
                .. [[">]]
                .. I18N.translate("Radicale CalDAV/CardDAV Server")
+               .. [[</a>]]
 end
 function app_description()
        return  I18N.translate("The Radicale Project is a complete CalDAV (calendar) and CardDAV (contact) server solution.") .. [[<br />]]