From 1eef7893068655f8d145a3e06061a9e6296ac1f3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 11:27:41 +0200
Subject: Reorganize subscription management code

There is still a lot of work to do. Some links are broken.

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/layout/aside_subscription.phtml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 app/layout/aside_subscription.phtml

(limited to 'app/layout/aside_subscription.phtml')

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
new file mode 100644
index 000000000..9a95763c3
--- /dev/null
+++ b/app/layout/aside_subscription.phtml
@@ -0,0 +1,17 @@
+<ul class="nav nav-list aside aside_feed">
+	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
+
+	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+	</li>
+
+	<li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
+		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('import_export'); ?></a>
+	</li>
+
+	<li class="item">
+		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
+			<?php echo _t('bookmark'); ?>
+		</a>
+	</li>
+</ul>
-- 
cgit v1.2.3


From 6dc1267b9832272abd466579053c2bcdedcb5ecb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 12:33:22 +0200
Subject: Fix Origine theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_subscription.phtml |  2 +-
 p/themes/Origine/origine.css        |  8 ++++----
 p/themes/base-theme/template.css    | 24 ++++++++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'app/layout/aside_subscription.phtml')

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index 9a95763c3..cbf5df67d 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -1,4 +1,4 @@
-<ul class="nav nav-list aside aside_feed">
+<ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 0a317695b..d01bed963 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -505,7 +505,7 @@ a.btn {
 .tree-folder-title {
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1.2rem;
+	font-size: 1rem;
 	font-weight: bold;
 }
 .tree-folder-items {
@@ -513,7 +513,7 @@ a.btn {
 	border-bottom: 1px solid #ccc;
 	background: #f6f6f6;
 }
-.tree-folder-items .item {
+.tree-folder-items > .item {
 	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
@@ -606,12 +606,12 @@ a.btn {
 .aside_feed .tree-folder-items .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .item > a {
+.aside_feed .tree-folder-items > .item > a {
 	line-height: 3em;
 	text-align: left;
 	text-decoration: none;
 }
-.aside_feed .tree-folder-items .item:not([data-unread="0"]) {
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index fb02a5b53..bcafd162c 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -331,19 +331,31 @@ a.btn {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-title {
-	display: block;
-}
 .tree-folder-items {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-items .item {
+.tree-folder-title {
 	display: block;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
+.tree-folder-title .title {
+	vertical-align: middle;
+}
+.tree-folder-items > .item {
+	display: block;
+	white-space: nowrap;
+}
+.tree-folder-items > .item > a {
+	display: inline-block;
+	vertical-align: middle;
+	width: calc(100% - 32px);
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -392,7 +404,7 @@ a.btn {
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] {
 	display: none;
 }
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
@@ -403,7 +415,7 @@ a.btn {
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_feed .tree-folder-items .item > a:not([data-unread="0"]):before {
+.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
 .aside_feed .tree-folder-items .dropdown-menu {
-- 
cgit v1.2.3


From 2f24f0fe882af0be6c893b16d9adae48e06bac1f Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 10 Dec 2014 22:37:49 +0100
Subject: Fix i18n for aside subscription

---
 app/i18n/en/gen.php                 | 2 --
 app/i18n/en/sub.php                 | 5 +++++
 app/i18n/fr/gen.php                 | 5 -----
 app/i18n/fr/sub.php                 | 5 +++++
 app/layout/aside_subscription.phtml | 8 ++++----
 5 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'app/layout/aside_subscription.phtml')

diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index c762713c1..f98c40c5b 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -110,7 +110,6 @@ return array(
 	'before_yesterday' => 'Before yesterday',
 	'blank_to_disable' => 'Leave blank to disable',
 	'blogotext' => 'Blogotext',
-	'bookmark' => 'Subscribe (FreshRSS bookmark)',
 	'bottom_line' => 'Bottom line',
 	'bugs_reports' => 'Bugs reports',
 	'by' => 'by',
@@ -235,7 +234,6 @@ return array(
 	'http_username' => 'HTTP username',
 	'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
 	'import' => 'Import',
-	'import_export' => 'Import / export',
 	'informations' => 'Information',
 	'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
 	'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index e64b6ca4b..d915a18a7 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -7,4 +7,9 @@ return array(
 	'feeds' => array(
 		'over_max' => 'You have reached your limit of feeds (%d)',
 	),
+	'menu' => array(
+		'bookmark' => 'Subscribe (FreshRSS bookmark)',
+		'import_export' => 'Import / export',
+		'subscription_management' => 'Subscriptions management',
+	),
 );
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index 9d9624cc8..06a08eb0a 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -110,7 +110,6 @@ return array(
 	'before_yesterday' => 'À partir d’avant-hier',
 	'blank_to_disable' => 'Laissez vide pour désactiver',
 	'blogotext' => 'Blogotext',
-	'bookmark' => 'S’abonner (bookmark FreshRSS)',
 	'bottom_line' => 'Ligne du bas',
 	'bugs_reports' => 'Rapports de bugs',
 	'by' => 'par',
@@ -235,7 +234,6 @@ return array(
 	'http_username' => 'Identifiant HTTP',
 	'img_with_lazyload' => 'Utiliser le mode “chargement différé” pour les images',
 	'import' => 'Importer',
-	'import_export' => 'Importer / exporter',
 	'informations' => 'Informations',
 	'install_not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
 	'installation_is_ok' => 'L’installation s’est bien passée.<br />La dernière étape va maintenant tenter de supprimer les fichiers ainsi que d’éventuelles copies de base de données créés durant le processus de mise à jour.<br />Vous pouvez choisir de sauter cette étape en supprimant <kbd>./data/do-install.txt</kbd> manuellement.',
@@ -421,11 +419,8 @@ return array(
 	'stats_entry_per_month' => 'Par mois (moyenne : %.2f messages)',
 	'stats_entry_repartition' => 'Répartition des articles',
 	'stats_feed_per_category' => 'Flux par catégorie',
-	'stats_idle' => 'Flux inactifs',
-	'stats_main' => 'Statistiques principales',
 	'stats_no_idle' => 'Il n’y a aucun flux inactif !',
 	'stats_percent_of_total' => '%% du total',
-	'stats_repartition' => 'Répartition des articles',
 	'stats_top_feed' => 'Les dix plus gros flux',
 	'status_favorites' => 'favoris',
 	'status_read' => 'lus',
diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php
index 6ef4002a6..7bb52b113 100644
--- a/app/i18n/fr/sub.php
+++ b/app/i18n/fr/sub.php
@@ -7,4 +7,9 @@ return array(
 	'feeds' => array(
 		'over_max' => 'Vous avez atteint votre limite de flux (%d)',
 	),
+	'menu' => array(
+		'bookmark' => 'S’abonner (bookmark FreshRSS)',
+		'import_export' => 'Importer / exporter',
+		'subscription_management' => 'Gestion des abonnements',
+	),
 );
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index cbf5df67d..8a54e2dc2 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -1,17 +1,17 @@
 <ul class="nav nav-list aside">
-	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
+	<li class="nav-header"><?php echo _t('sub.menu.subscription_management'); ?></li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+		<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('sub.menu.subscription_management'); ?></a>
 	</li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'importExport' ? ' active' : ''; ?>">
-		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('import_export'); ?></a>
+		<a href="<?php echo _url('importExport', 'index'); ?>"><?php echo _t('sub.menu.import_export'); ?></a>
 	</li>
 
 	<li class="item">
 		<a onclick="return false;" href="javascript:(function(){var%20url%20=%20location.href;window.open('<?php echo Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true); ?>&amp;url_rss='+encodeURIComponent(url), '_blank');})();">
-			<?php echo _t('bookmark'); ?>
+			<?php echo _t('sub.menu.bookmark'); ?>
 		</a>
 	</li>
 </ul>
-- 
cgit v1.2.3