changed the foldername Everything to Subscriptions, removed strtoupper for foldername dropdown menu to prevent confusion, made the button for folder selection wider and hid overflow

6 files changed, 6 insertions, 6 deletions

diff --git a/ajax/populateroot.php b/ajax/populateroot.php
index 73b986a3e..a372d12d8 100644
--- a/ajax/populateroot.php
+++ b/ajax/populateroot.php
@@ -6,7 +6,7 @@ OCP\JSON::checkAppEnabled('news');
 $foldermapper = new OC_News_FolderMapper(OCP\USER::getUser());
 $l = new OC_l10n('news');
 
-$folder = new OC_News_Folder($l->t('Everything'), 0);
+$folder = new OC_News_Folder($l->t('Subscriptions'), 0);
 
 $allfeeds = $foldermapper->populate($folder);
 
diff --git a/css/news.css b/css/news.css
index ae3e9ab3d..5984d614d 100644
--- a/css/news.css
+++ b/css/news.css
@@ -80,7 +80,7 @@ ul.controls li { float: left; }
 /* dialog/menues */
 div.dialog { overflow: visible; }
 
-#dropdownBtn { width: 9em; padding-left: 0; padding-right:20px; background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; }
+#dropdownBtn { width: 20em; padding-left: 0; padding-right:20px; background: url('%webroot%/core/img/actions/triangle-s.svg') no-repeat right center; text-align: left; overflow: hidden;}
 ul#dropdownmenu { left: 0em; box-shadow: 0px 0px 10px rgb(0, 0, 0); }
 
 ul#feedfoldermenu { position:fixed; margin-left: 0; bottom: 2.8em; border-left:1px solid #ccc; border-top:1px solid #ccc; border-right:1px solid #ccc; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
diff --git a/index.php b/index.php
index 5d9500837..09584c9ae 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@ $userid = OCP\USER::getUser();
 
 $foldermapper = new OC_News_FolderMapper($userid);
 
-$folder = new OC_News_Folder($l->t('Everything'), 0);
+$folder = new OC_News_Folder($l->t('Subscriptions'), 0);
 
 $allfeeds = $foldermapper->populate($folder);
 
diff --git a/templates/part.feeddialog.php b/templates/part.feeddialog.php
index 6807f3c5b..99332d421 100644
--- a/templates/part.feeddialog.php
+++ b/templates/part.feeddialog.php
@@ -6,7 +6,7 @@
 	<td>
 		<div class="add_parentfolder">
 			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
-			    <?php echo $l->t('EVERYTHING'); ?>
+			    <?php echo $l->t('Subscriptions'); ?>
 			</button>
 			<input id="inputfolderid" type="hidden" name="folderid" value="0" />
 			<ul class="menu" id="dropdownmenu">
diff --git a/templates/part.folderdialog.php b/templates/part.folderdialog.php
index e1217160c..fb1a819af 100644
--- a/templates/part.folderdialog.php
+++ b/templates/part.folderdialog.php
@@ -6,7 +6,7 @@
 	<td>
 		<div class="add_parentfolder">
 			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
-			    <?php echo $l->t('EVERYTHING'); ?>
+			    <?php echo $l->t('Subscriptions'); ?>
 			</button>
 			<input id="inputfolderid" type="hidden" name="folderid" value="0" />
 			<ul class="menu" id="dropdownmenu">
diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php
index a5f9626c6..b4b966e3c 100644
--- a/templates/part.folderlist.php
+++ b/templates/part.folderlist.php
@@ -1,6 +1,6 @@
 <?php
 	function print_folder(OC_News_Folder $folder, $depth){
-		echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . strtoupper($folder->getName()) . '</li>';
+		echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . $folder->getName() . '</li>';
 		$children = $folder->getChildren();
 		foreach($children as $child) {
 			if ($child instanceOf OC_News_Folder){