diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-03 05:05:53 -0800 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-03 05:05:53 -0800 |
| commit | c4ad9c531bbbbf49119802596949a17861510afe (patch) | |
| tree | 3ffc8d2eaabe282019104d39c8ebfab6c1aed45d /app/views | |
| parent | b339ce852696ef641871e097489aeb511c5dfae8 (diff) | |
| parent | 839477eb85f7ac0fa4e5d80574547060c87f743a (diff) | |
Merge pull request #340 from aledeg/partage
Partage d'article
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/shortcut.phtml | 7 | ||||
| -rw-r--r-- | app/views/helpers/javascript_vars.phtml | 3 | ||||
| -rw-r--r-- | app/views/helpers/view/normal_view.phtml | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index 2e564a7b6..b0867f711 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -68,6 +68,13 @@ </div> </div> + <div class="form-group"> + <label class="group-name" for="auto_share_shortcut"><?php echo Minz_Translate::t ('auto_share'); ?></label> + <div class="group-controls"> + <input type="text" id="auto_share_shortcut" name="shortcuts[auto_share]" list="keys" value="<?php echo $s['auto_share']; ?>" /> + </div> + </div> + <div class="form-group form-actions"> <div class="group-controls"> <button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button> diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index 8419b9391..92c068f7e 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -18,7 +18,8 @@ 'prev_entry:"', $s['prev_entry'], '",', 'next_entry:"', $s['next_entry'], '",', 'collapse_entry:"', $s['collapse_entry'], '",', - 'load_more:"', $s['load_more'], '"', + 'load_more:"', $s['load_more'], '",', + 'auto_share:"', $s['auto_share'], '"', "},\n"; if (Minz_Request::param ('output') === 'global') { diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index ce036e281..50afa6903 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -7,9 +7,11 @@ if (!empty($this->entries)) { $display_today = true; $display_yesterday = true; $display_others = true; - $shaarli = $this->loginOk && $this->conf->sharing ('shaarli'); - $poche = $this->loginOk && $this->conf->sharing ('poche'); - $diaspora = $this->loginOk && $this->conf->sharing ('diaspora'); + if ($this->loginOk) { + $shaarli = $this->conf->sharing ('shaarli'); + $poche = $this->conf->sharing ('poche'); + $diaspora = $this->conf->sharing ('diaspora'); + } $twitter = $this->conf->sharing ('twitter'); $google_plus = $this->conf->sharing ('g+'); $facebook = $this->conf->sharing ('facebook'); |