summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--css/news.css6
-rw-r--r--img/eye_all.pngbin0 -> 515 bytes
-rw-r--r--img/eye_unread.pngbin0 -> 515 bytes
-rw-r--r--js/main.js12
4 files changed, 8 insertions, 10 deletions
diff --git a/css/news.css b/css/news.css
index 6f9eb578e..69fdc2473 100644
--- a/css/news.css
+++ b/css/news.css
@@ -317,16 +317,16 @@ div.add_parentfolder {
#feed_settings #view button {
padding-top: .2em;
background-size: 80%;
- background-position: center;
+ background-position: center center;
background-repeat: no-repeat;
}
#feed_settings #view.show_all button {
- background-image: url('%appswebroot%/news/img/eye_all.svg');
+ background-image: url('%appswebroot%/news/img/eye_all.png');
}
#feed_settings #view.show_unread button {
- background-image: url('%appswebroot%/news/img/eye_unread.svg');
+ background-image: url('%appswebroot%/news/img/eye_unread.png');
}
#feed_settings #addfeedfolder {
diff --git a/img/eye_all.png b/img/eye_all.png
new file mode 100644
index 000000000..6ef3f2227
--- /dev/null
+++ b/img/eye_all.png
Binary files differ
diff --git a/img/eye_unread.png b/img/eye_unread.png
new file mode 100644
index 000000000..c53380db8
--- /dev/null
+++ b/img/eye_unread.png
Binary files differ
diff --git a/js/main.js b/js/main.js
index 8032987ae..d52aa1c66 100644
--- a/js/main.js
+++ b/js/main.js
@@ -97,23 +97,21 @@ $(document).ready(function(){
$('#view').click(function(){
var data = {};
+ var showAll;
if($(this).hasClass('show_all')){
data.show = 'unread';
+ showAll = true;
$(this).addClass('show_unread').removeClass('show_all');
} else {
data.show = 'all';
+ showAll = false;
$(this).addClass('show_all').removeClass('show_unread');
}
+ News.Objects.Menu.setShowAll(showAll);
$.post(OC.filePath('news', 'ajax', 'usersettings.php'), data, function(jsondata){
if(jsondata.status == 'success'){
- var showAll;
- if(data.show === 'all'){
- showAll = true;
- } else {
- showAll = false;
- }
- News.Objects.Menu.setShowAll(showAll);
+
} else {
OC.dialogs.alert(jsonData.data.message, t('news', 'Error'));
}