diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-15 01:33:28 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-15 01:33:28 -0700 |
| commit | 5e475acb85cac2dd87f92f6c8d51dc0071e5c2eb (patch) | |
| tree | 2365746a5e87318cd1b8e5b387b24dc0f3b1f595 | |
| parent | f666d8a0838efec0e05fcd9ea884eb6733cea3a8 (diff) | |
| download | volse-hubzilla-5e475acb85cac2dd87f92f6c8d51dc0071e5c2eb.tar.gz volse-hubzilla-5e475acb85cac2dd87f92f6c8d51dc0071e5c2eb.tar.bz2 volse-hubzilla-5e475acb85cac2dd87f92f6c8d51dc0071e5c2eb.zip | |
cleanup and debug of atoken feature
| -rw-r--r-- | Zotlabs/Module/Settings.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 8 | ||||
| -rw-r--r-- | view/tpl/settings_tokens.tpl | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index b1f6c8144..44088fea5 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -138,7 +138,7 @@ class Settings extends \Zotlabs\Web\Controller { return; } if($atoken_id) { - $r = q("update atoken set atoken_name = '%s', atoken_token = '%s' atoken_expire = '%s' + $r = q("update atoken set atoken_name = '%s', atoken_token = '%s' atoken_expires = '%s' where atoken_id = %d and atoken_uid = %d", dbesc($name), dbesc($token), @@ -148,7 +148,7 @@ class Settings extends \Zotlabs\Web\Controller { ); } else { - $r = q("insert into atoken ( atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expire ) + $r = q("insert into atoken ( atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expires ) values ( %d, %d, '%s', '%s', '%s' ) ", intval($channel['channel_account_id']), intval($channel['channel_id']), diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5768ccbd9..5f1637c50 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2039,3 +2039,11 @@ dl.bb-dl > dd > li { border-style: solid; border-width: 5px; } + +.atoken-list { + margin-right: 5px; + list-style-type: none; +} +.atoken-list li { + margin-bottom: 8px; +}
\ No newline at end of file diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl index 8763a681c..73c6e9a64 100644 --- a/view/tpl/settings_tokens.tpl +++ b/view/tpl/settings_tokens.tpl @@ -17,9 +17,9 @@ </form> {{if $tokens}} <div> - <ul> + <ul class="atoken-list"> {{foreach $tokens as $t}} - <li><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a> <a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-remove btn btn-xs btn-default pull-right"></i></a></li> + <li><span class="pull-right atoken-drop"><a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-trash btn btn-xs btn-default"></i></a></span><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></li> {{/foreach}} </ul> </div> |