Merge pull request #831 from ArthurHoaro/theme/install-api-enable

Add API setting in the new theme during the installation

4 files changed, 23 insertions, 5 deletions

diff --git a/index.php b/index.php
index bf312d55..58bb3f44 100644
--- a/index.php
+++ b/index.php
@@ -1141,7 +1141,7 @@ function renderPage($conf, $pluginManager, $LINKSDB)
             $conf->set('feed.rss_permalinks', !empty($_POST['enableRssPermalinks']));
             $conf->set('updates.check_updates', !empty($_POST['updateCheck']));
             $conf->set('privacy.hide_public_links', !empty($_POST['hidePublicLinks']));
-            $conf->set('api.enabled', !empty($_POST['apiEnabled']));
+            $conf->set('api.enabled', !empty($_POST['enableApi']));
             $conf->set('api.secret', escape($_POST['apiSecret']));
             try {
                 $conf->write(isLoggedIn());
diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index d6536d47..12261487 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -186,7 +186,7 @@
       <div class="pure-g">
         <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
           <div class="form-label">
-            <label for="apiEnabled">
+            <label for="enableApi">
               <span class="label-name">{'Enable REST API'|t}</span><br>
               <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
             </label>
@@ -194,7 +194,7 @@
         </div>
         <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
           <div class="form-input">
-            <input type="checkbox" name="apiEnabled" id="apiEnabled"
+            <input type="checkbox" name="enableApi" id="enableApi"
                  {if="$api_enabled"}checked{/if}/>
           </div>
         </div>
diff --git a/tpl/default/install.html b/tpl/default/install.html
index 33f8a453..663397ac 100644
--- a/tpl/default/install.html
+++ b/tpl/default/install.html
@@ -7,6 +7,8 @@
 
 {$ratioLabel='1-4'}
 {$ratioInput='3-4'}
+{$ratioLabelMobile='7-8'}
+{$ratioInputMobile='1-8'}
 
 <form method="POST" action="#" name="installform" id="installform">
 <div class="pure-g">
@@ -98,6 +100,22 @@
       </div>
     </div>
 
+    <div class="pure-g">
+      <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
+        <div class="form-label">
+          <label for="enableApi">
+            <span class="label-name">{'Enable REST API'|t}</span><br>
+            <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
+          </label>
+        </div>
+      </div>
+      <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
+        <div class="form-input">
+          <input type="checkbox" name="enableApi" id="enableApi" checked />
+        </div>
+      </div>
+    </div>
+
     <div class="center">
       <input type="submit" value="{'Install'|t}" name="Save">
     </div>
diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html
index 5820e6e4..704389c5 100644
--- a/tpl/vintage/configure.html
+++ b/tpl/vintage/configure.html
@@ -97,9 +97,9 @@
       <tr>
         <td valign="top"><b>Enable REST API</b></td>
         <td>
-          <input type="checkbox" name="apiEnabled" id="apiEnabled"
+          <input type="checkbox" name="enableApi" id="enableApi"
                  {if="$api_enabled"}checked{/if}/>
-          <label for="apiEnabled">&nbsp;Allow third party software to use Shaarli such as mobile application.</label>
+          <label for="enableApi">&nbsp;Allow third party software to use Shaarli such as mobile application.</label>
         </td>
       </tr>
       <tr>