aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2017-03-23 18:32:26 +0100
committerGitHub <noreply@github.com>2017-03-23 18:32:26 +0100
commitbae74cb292833a4482b3a42b78c020b7f97b7ffd (patch)
treeb872dd34a32cace7dab4463c3e5f669cef85ae94
parent4296080c8e0bc0576564bfb52bfe2cbc94fafed3 (diff)
parent76be95e199fb0ebbbcdfff4843b59b805762e475 (diff)
downloadShaarli-bae74cb292833a4482b3a42b78c020b7f97b7ffd.tar.gz
Shaarli-bae74cb292833a4482b3a42b78c020b7f97b7ffd.tar.zst
Shaarli-bae74cb292833a4482b3a42b78c020b7f97b7ffd.zip
Merge pull request #831 from ArthurHoaro/theme/install-api-enable
Add API setting in the new theme during the installation
-rw-r--r--index.php2
-rw-r--r--tpl/default/configure.html4
-rw-r--r--tpl/default/install.html18
-rw-r--r--tpl/vintage/configure.html4
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)
1141 $conf->set('feed.rss_permalinks', !empty($_POST['enableRssPermalinks'])); 1141 $conf->set('feed.rss_permalinks', !empty($_POST['enableRssPermalinks']));
1142 $conf->set('updates.check_updates', !empty($_POST['updateCheck'])); 1142 $conf->set('updates.check_updates', !empty($_POST['updateCheck']));
1143 $conf->set('privacy.hide_public_links', !empty($_POST['hidePublicLinks'])); 1143 $conf->set('privacy.hide_public_links', !empty($_POST['hidePublicLinks']));
1144 $conf->set('api.enabled', !empty($_POST['apiEnabled'])); 1144 $conf->set('api.enabled', !empty($_POST['enableApi']));
1145 $conf->set('api.secret', escape($_POST['apiSecret'])); 1145 $conf->set('api.secret', escape($_POST['apiSecret']));
1146 try { 1146 try {
1147 $conf->write(isLoggedIn()); 1147 $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 @@
186 <div class="pure-g"> 186 <div class="pure-g">
187 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> 187 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
188 <div class="form-label"> 188 <div class="form-label">
189 <label for="apiEnabled"> 189 <label for="enableApi">
190 <span class="label-name">{'Enable REST API'|t}</span><br> 190 <span class="label-name">{'Enable REST API'|t}</span><br>
191 <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span> 191 <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
192 </label> 192 </label>
@@ -194,7 +194,7 @@
194 </div> 194 </div>
195 <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}"> 195 <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
196 <div class="form-input"> 196 <div class="form-input">
197 <input type="checkbox" name="apiEnabled" id="apiEnabled" 197 <input type="checkbox" name="enableApi" id="enableApi"
198 {if="$api_enabled"}checked{/if}/> 198 {if="$api_enabled"}checked{/if}/>
199 </div> 199 </div>
200 </div> 200 </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 @@
7 7
8{$ratioLabel='1-4'} 8{$ratioLabel='1-4'}
9{$ratioInput='3-4'} 9{$ratioInput='3-4'}
10{$ratioLabelMobile='7-8'}
11{$ratioInputMobile='1-8'}
10 12
11<form method="POST" action="#" name="installform" id="installform"> 13<form method="POST" action="#" name="installform" id="installform">
12<div class="pure-g"> 14<div class="pure-g">
@@ -98,6 +100,22 @@
98 </div> 100 </div>
99 </div> 101 </div>
100 102
103 <div class="pure-g">
104 <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
105 <div class="form-label">
106 <label for="enableApi">
107 <span class="label-name">{'Enable REST API'|t}</span><br>
108 <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
109 </label>
110 </div>
111 </div>
112 <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
113 <div class="form-input">
114 <input type="checkbox" name="enableApi" id="enableApi" checked />
115 </div>
116 </div>
117 </div>
118
101 <div class="center"> 119 <div class="center">
102 <input type="submit" value="{'Install'|t}" name="Save"> 120 <input type="submit" value="{'Install'|t}" name="Save">
103 </div> 121 </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 @@
97 <tr> 97 <tr>
98 <td valign="top"><b>Enable REST API</b></td> 98 <td valign="top"><b>Enable REST API</b></td>
99 <td> 99 <td>
100 <input type="checkbox" name="apiEnabled" id="apiEnabled" 100 <input type="checkbox" name="enableApi" id="enableApi"
101 {if="$api_enabled"}checked{/if}/> 101 {if="$api_enabled"}checked{/if}/>
102 <label for="apiEnabled">&nbsp;Allow third party software to use Shaarli such as mobile application.</label> 102 <label for="enableApi">&nbsp;Allow third party software to use Shaarli such as mobile application.</label>
103 </td> 103 </td>
104 </tr> 104 </tr>
105 <tr> 105 <tr>