Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Add API setting in the new theme during the installation
This commit is contained in:
ArthurHoaro 2017-03-23 18:32:26 +01:00 committed by GitHub
parent 4296080c8e 76be95e199
commit bae74cb292
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.php
View file

@ -1141,7 +1141,7 @@ function renderPage($conf, $pluginManager, $LINKSDB)
$conf->set('feed.rss_permalinks', !empty($_POST['enableRssPermalinks'])); $conf->set('feed.rss_permalinks', !empty($_POST['enableRssPermalinks']));
$conf->set('updates.check_updates', !empty($_POST['updateCheck'])); $conf->set('updates.check_updates', !empty($_POST['updateCheck']));
$conf->set('privacy.hide_public_links', !empty($_POST['hidePublicLinks'])); $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'])); $conf->set('api.secret', escape($_POST['apiSecret']));
try { try {
$conf->write(isLoggedIn()); $conf->write(isLoggedIn());

4
tpl/default/configure.html
View file

@ -186,7 +186,7 @@
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
<div class="form-label"> <div class="form-label">
<label for="apiEnabled"> <label for="enableApi">
<span class="label-name">{'Enable REST API'|t}</span><br> <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> <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span>
</label> </label>
@ -194,7 +194,7 @@
</div> </div>
<div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}"> <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
<div class="form-input"> <div class="form-input">
<input type="checkbox" name="apiEnabled" id="apiEnabled" <input type="checkbox" name="enableApi" id="enableApi"
{if="$api_enabled"}checked{/if}/> {if="$api_enabled"}checked{/if}/>
</div> </div>
</div> </div>

18
tpl/default/install.html
View file

@ -7,6 +7,8 @@
{$ratioLabel='1-4'} {$ratioLabel='1-4'}
{$ratioInput='3-4'} {$ratioInput='3-4'}
{$ratioLabelMobile='7-8'}
{$ratioInputMobile='1-8'}
<form method="POST" action="#" name="installform" id="installform"> <form method="POST" action="#" name="installform" id="installform">
<div class="pure-g"> <div class="pure-g">
@ -98,6 +100,22 @@
</div> </div>
</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"> <div class="center">
<input type="submit" value="{'Install'|t}" name="Save"> <input type="submit" value="{'Install'|t}" name="Save">
</div> </div>

4
tpl/vintage/configure.html
View file

@ -97,9 +97,9 @@
<tr> <tr>
<td valign="top"><b>Enable REST API</b></td> <td valign="top"><b>Enable REST API</b></td>
<td> <td>
<input type="checkbox" name="apiEnabled" id="apiEnabled" <input type="checkbox" name="enableApi" id="enableApi"
{if="$api_enabled"}checked{/if}/> {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> </td>
</tr> </tr>
<tr> <tr>