corrected name of installation description (#2983)

zikula · Aug 19, 2016 · f8d6191 · f8d6191
1 parent 598178c
commit f8d6191
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ For more information visit http://zikula.org/
 Requirements
 ------------
 Before installing Zikula it's important to ensure that the hosting server environment meets the requirements
-of the new core release. Zikula Core 1.4.0 has the following requirements:
+of the new core release. Zikula Core 1.4.x has the following requirements:
 
 |               | Minimum       | Recommended  |
 | ------------- |:-------------:| :-----------:|

diff --git a/build.xml b/build.xml
@@ -193,6 +193,7 @@
 
     <target name="build_patch">
         <echo msg="Making patches...."/>
+        <!-- TODO this needs an overhaul as it is still using SVN -->
         <!-- get diffs for releases and save in ${tmpdir}/CHANGES file -->
         <!-- ATTN urls require manual edit -->
         <exec escape="false"

diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/DocController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/DocController.php
@@ -61,11 +61,11 @@ public function __construct(KernelInterface $kernel, RouterInterface $router, En
      * @param string $name
      * @return Response
      */
-    public function displayAction(Request $request, $name = 'INSTALL-1.4.0.md')
+    public function displayAction(Request $request, $name = 'INSTALL-1.4.md')
     {
         // @TODO this is temporary method of restricting the user input
-        if (!in_array($name, ['INSTALL-1.4.0.md', 'UPGRADE-1.4.md', 'CHANGELOG.md', 'README.md'])) {
-            $name = 'INSTALL-1.4.0.md';
+        if (!in_array($name, ['INSTALL-1.4.md', 'UPGRADE-1.4.md', 'CHANGELOG.md', 'README.md'])) {
+            $name = 'INSTALL-1.4.md';
         }
         $this->setBasePath();
 

diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/config/routing/routing.xml b/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/config/routing/routing.xml
@@ -28,7 +28,7 @@
 
     <route id="doc" path="/installdoc/{name}">
         <default key="_controller">core_installer.controller.doc:displayAction</default>
-        <default key="name">INSTALL-1.4.0.md</default>
+        <default key="name">INSTALL-1.4.md</default>
     </route>
 
 </routes>
diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/views/Install/notinstalled.html.twig b/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/views/Install/notinstalled.html.twig
@@ -12,7 +12,7 @@
                 <p>
                     {{ __f('You are seeing this message because Zikula is not yet installed. You can install Zikula by clicking
                     on the install button, but before doing so please read the %inst%. Further information can be found in the %docs%.',
-                    {'%inst%': '<a href="%url%" onclick="window.open(this.href);return false;">%text%</a>' | replace({'%url%': path('doc', {'name': 'INSTALL-1.4.0.md'}), '%text%': __('installation instructions') }),
+                    {'%inst%': '<a href="%url%" onclick="window.open(this.href);return false;">%text%</a>' | replace({'%url%': path('doc', {'name': 'INSTALL-1.4.md'}), '%text%': __('installation instructions') }),
                      '%docs%': '<a href="%url%" onclick="window.open(this.href);return false;">%text%</a>' | replace({'%url%': 'http://www.zikula.org', '%text%': __('online documentation') }) } ) | raw }}
                 </p>
                 <noscript><p class="alert alert-warning">{{ __('You have JavaScript disabled. Please activate it to proceed or use the CLI script instead.') }}</p></noscript>

diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/views/installheader.html.twig b/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/views/installheader.html.twig
@@ -17,7 +17,7 @@
     </ol>
     <p class="installguide"><em>{{ __f("Please refer to the %s during the process.",
             { '%s': '<a href="%url%" onclick="window.open(this.href);return false;">%text%</a>' | replace({
-                '%url%': path('doc', {'name': 'INSTALL-1.4.0.md'}),
+                '%url%': path('doc', {'name': 'INSTALL-1.4.md'}),
                 '%text%': __('installation guide') }) } ) | raw }}</em>
     </p>
 </div>
diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/views/theme.html.twig b/src/lib/Zikula/Bundle/CoreInstallerBundle/Resources/views/theme.html.twig
@@ -28,7 +28,7 @@
     <div id="footer" class="footer">
         <ul>
             <li><strong>{{ __("Useful resources") }}:</strong></li>
-            <li><a href="{{ path('doc', {'name': 'INSTALL-1.4.0.md'}) }}" onclick="window.open(this.href);return false;">{{ __("Installation guide") }}</a></li>
+            <li><a href="{{ path('doc', {'name': 'INSTALL-1.4.md'}) }}" onclick="window.open(this.href);return false;">{{ __("Installation guide") }}</a></li>
             <li><a href="https://github.com/zikula/core/wiki" onclick="window.open(this.href);return false;">{{ __("Zikula documentation") }}</a></li>
             <li><a href="http://www.zikula.org/forums" onclick="window.open(this.href);return false;">{{ __("Support forums") }}</a></li>
             {# custom links for each action go here #}