individual settings for share buttons, and added tumblr (#582)

This commit is contained in:
Athou
2014-04-16 12:29:53 +02:00
parent bb72131354
commit 32a30019a7
7 changed files with 198 additions and 23 deletions

View File

@@ -81,33 +81,36 @@
</label>
</div>
<span class="share-buttons" ng-if="settingsService.settings.socialButtons">
<a href="mailto:?subject={{entry.title|escape}}&body={{entry.url|escape}}" title="E-mail" popup>
<span class="share-buttons">
<a href="mailto:?subject={{entry.title|escape}}&body={{entry.url|escape}}" title="E-mail" popup ng-if="settingsService.settings.email">
<i class="icon-envelope"></i>
</a>
<a href="https://mail.google.com/mail/?view=cm&fs=1&tf=1&source=mailto&su={{entry.title|escape}}&body={{entry.url|escape}}"
title="Gmail" popup>
title="Gmail" popup ng-if="settingsService.settings.gmail">
<i class="icon-gmail"></i>
</a>
<a href="http://www.facebook.com/sharer.php?u=={{entry.url|escape}}" title="Facebook" popup>
<a href="http://www.facebook.com/sharer.php?u=={{entry.url|escape}}" title="Facebook" popup ng-if="settingsService.settings.facebook">
<i class="icon-facebook"></i>
</a>
<a href="http://twitter.com/share?text={{entry.title|escape}}&url={{entry.url|escape}}" title="Twitter" popup>
<a href="http://twitter.com/share?text={{entry.title|escape}}&url={{entry.url|escape}}" title="Twitter" popup ng-if="settingsService.settings.twitter">
<i class="icon-twitter"></i>
</a>
<a href="https://plus.google.com/share?url={{entry.url|escape}}" title="Google+" popup>
<a href="https://plus.google.com/share?url={{entry.url|escape}}" title="Google+" popup ng-if="settingsService.settings.googleplus">
<i class="icon-google-plus"></i>
</a>
<a href="https://getpocket.com/save?url={{entry.url|escape}}&title={{entry.title|escape}}" title="Pocket" popup>
<a href="http://www.tumblr.com/share/link?url={{entry.url|escape}}&name={{entry.title|escape}}" title="Tumblr" popup ng-if="settingsService.settings.tumblr">
<i class="icon-tumblr"></i>
</a>
<a href="https://getpocket.com/save?url={{entry.url|escape}}&title={{entry.title|escape}}" title="Pocket" popup ng-if="settingsService.settings.pocket">
<i class="icon-pocket"></i>
</a>
<a href="https://www.instapaper.com/hello2?url={{entry.url|escape}}&title={{entry.title|escape}}" title="Instapaper" popup>
<a href="https://www.instapaper.com/hello2?url={{entry.url|escape}}&title={{entry.title|escape}}" title="Instapaper" popup ng-if="settingsService.settings.instapaper">
<i class="icon-instapaper"></i>
</a>
<a href="https://bufferapp.com/add?url={{entry.url|escape}}&text={{entry.title|escape}}" title="Buffer" popup>
<a href="https://bufferapp.com/add?url={{entry.url|escape}}&text={{entry.title|escape}}" title="Buffer" popup ng-if="settingsService.settings.buffer">
<i class="icon-buffer"></i>
</a>
<a href="http://www.readability.com/save?url={{entry.url|escape}}" title="Readability" popup>
<a href="http://www.readability.com/save?url={{entry.url|escape}}" title="Readability" popup ng-if="settingsService.settings.readability">
<i class="icon-couch"></i>
</a>
</span>

View File

@@ -34,18 +34,85 @@
${settings.general.show_unread}
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="socialButtons" ng-model="settings.socialButtons" />
${settings.general.social_buttons}
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" name="scrollMarks" ng-model="settings.scrollMarks" />
${settings.general.scroll_marks}
</label>
</div>
<div>
<h4>${settings.general.social_buttons}</h4>
<div>
<label>
<input type="checkbox" name="email" ng-model="settings.email" />
<i class="icon-envelope"></i>
E-Mail
</label>
</div>
<div>
<label>
<input type="checkbox" name="gmail" ng-model="settings.gmail" />
<i class="icon-gmail"></i>
GMail
</label>
</div>
<div>
<label>
<input type="checkbox" name="facebook" ng-model="settings.facebook" />
<i class="icon-facebook"></i>
Facebook
</label>
</div>
<div>
<label>
<input type="checkbox" name="twitter" ng-model="settings.twitter" />
<i class="icon-twitter"></i>
Twitter
</label>
</div>
<div>
<label>
<input type="checkbox" name="googleplus" ng-model="settings.googleplus" />
<i class="icon-google-plus"></i>
Google+
</label>
</div>
<div>
<label>
<input type="checkbox" name="tumblr" ng-model="settings.tumblr" />
<i class="icon-tumblr"></i>
Tumblr
</label>
</div>
<div>
<label>
<input type="checkbox" name="pocket" ng-model="settings.pocket" />
<i class="icon-pocket"></i>
Pocket
</label>
</div>
<div>
<label>
<input type="checkbox" name="instapaper" ng-model="settings.instapaper" />
<i class="icon-instapaper"></i>
Instapaper
</label>
</div>
<div>
<label>
<input type="checkbox" name="buffer" ng-model="settings.buffer" />
<i class="icon-buffer"></i>
Buffer
</label>
</div>
<div>
<label>
<input type="checkbox" name="readability" ng-model="settings.readability" />
<i class="icon-couch"></i>
Readability
</label>
</div>
</div>
</div>
</div>
<div class="tab-pane" ng-class="{active: tab == 'css'}">