From 66c73a96ac2dda076bcfe0dc0a1ca2a7e169149d Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Tue, 21 Oct 2014 18:19:23 +0200 Subject: first try to set indention limit at 80 characters in php --- templates/admin.php | 13 +++-- templates/index.php | 28 +++++++--- templates/part.content.firstrun.php | 12 ++++- templates/part.content.php | 91 +++++++++++++++++++++++++------- templates/part.content.shortcuts.php | 12 +++-- templates/part.navigation.addfeed.php | 33 ++++++++---- templates/part.navigation.addfolder.php | 14 +++-- templates/part.navigation.feed.php | 38 +++++++++---- templates/part.navigation.folder.php | 72 +++++++++++++++++++------ templates/part.navigation.unreadfeed.php | 6 ++- templates/part.settings.php | 31 +++++++---- 11 files changed, 264 insertions(+), 86 deletions(-) (limited to 'templates') diff --git a/templates/admin.php b/templates/admin.php index c1aa99b6f..8786e892c 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -27,8 +27,9 @@ style('news', 'admin');

t( - 'Minimum amount of seconds after deleted feeds and folders are ' . - 'removed from the database; values below 60 seconds are ignored' + 'Minimum amount of seconds after deleted feeds and folders ' . + 'are removed from the database; values below 60 seconds are ' . + 'ignored' )); ?>

- t('How many seconds a feed should be cached')); ?> + + t('How many seconds a feed should be cached')); ?> +

@@ -73,8 +76,8 @@ style('news', 'admin');

t( - 'Maximum number of seconds to wait for an RSS or Atom feed to ' . - 'load; if it takes longer the update will be aborted.' + 'Maximum number of seconds to wait for an RSS or Atom feed ' . + 'to load; if it takes longer the update will be aborted.' )); ?>

-

+
-
- +
+ + +
    inc('part.navigation.addfeed')) ?> inc('part.navigation.addfolder')) ?> inc('part.navigation.unreadfeed')) ?> inc('part.navigation.starredfeed')) ?> - inc('part.navigation.feed', ['folderId' => '0'])) ?> + inc( + 'part.navigation.feed', ['folderId' => '0'] + )) ?> inc('part.navigation.folder')) ?>
@@ -40,12 +49,17 @@ script('news', [
- - + +

t('Add a feed')) ?>

-

t('There are no feeds yet. Go ahead and add some')) ?> :)

-

t('Import feeds and articles')) ?>

+
+

+ t('There are no feeds yet. Go ahead and add some')) + ?> :) +

+
+
+

t('Import feeds and articles')) ?>

+
\ No newline at end of file diff --git a/templates/part.content.php b/templates/part.content.php index 10f8d860e..beb8bd24d 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -2,13 +2,21 @@
-
- + ng-class="{ + compact: Content.isCompactView(), + 'feed-view': Content.isFeed() + }"> +
+
  • @@ -26,22 +34,53 @@
  • + ng-class="{ + 'icon-rss': + !Content.getFeed(item.feedId).faviconLink + }" + ng-style="{ + backgroundImage: + 'url(' + + Content.getFeed(item.feedId).faviconLink + + ')' + }">

    {{ item.title }}

  • -
  • -
  • - - +
  • + +
  • -
  • - - +
  • + +
@@ -49,8 +88,13 @@
- +

@@ -72,8 +122,9 @@

- t('Browser can not play media type')) ?>: - {{ item.enclosureMime }} + t('Browser can not play media type')) + ?>: {{ item.enclosureMime }}

h - t('Star article and jump to next one')); ?> + + t('Star article and jump to next one')); ?> + u - t('Toggle keep current article unread')); ?> + + t('Toggle keep current article unread')); ?> + o @@ -31,7 +35,9 @@ e - t('Toggle expand article in compact view')); ?> + + t('Toggle expand article in compact view')); ?> + r diff --git a/templates/part.navigation.addfeed.php b/templates/part.navigation.addfeed.php index 5ef8e858a..386e8800e 100644 --- a/templates/part.navigation.addfeed.php +++ b/templates/part.navigation.addfeed.php @@ -7,7 +7,8 @@
-
+

+ ng-show="!Navigation.addingFeed && + Navigation.feedUrlExists(Navigation.feed.url)"> t('Feed exists already!')); ?>

@@ -30,8 +32,10 @@ title="t('Folder')); ?>" ng-if="!Navigation.showNewFolder" ng-model="Navigation.feed.existingFolder" - ng-options="folder.name for folder in Navigation.getFolders() track by folder.name"> - + ng-options="folder.name for folder in + Navigation.getFolders() track by folder.name"> + + ng-click="Navigation.showNewFolder=false; + Navigation.feed.newFolder=''"> + -

t('Folder exists already!')); ?>

+

+ t('Folder exists already!')); ?> +

+ ng-disabled=" + Navigation.feedUrlExists(Navigation.feed.url) || + ( + Navigation.showNewFolder && + Navigation.folderNameExists(folder.name) + )">
diff --git a/templates/part.navigation.addfolder.php b/templates/part.navigation.addfolder.php index 2f65e9d2b..965d92159 100644 --- a/templates/part.navigation.addfolder.php +++ b/templates/part.navigation.addfolder.php @@ -2,7 +2,9 @@
+ news-focus="#new-folder [name='folderName']"> + t('New Folder'))?> +
@@ -11,14 +13,20 @@
-

t('Folder exists already!')); ?>

+

+ t('Folder exists already!')); ?> +

0 }" - ng-repeat="feed in Navigation.getFeedsOfFolder() | orderBy:'id':true track by feed.url" + ng-repeat="feed in Navigation.getFeedsOfFolder() + | orderBy:'id':true track by feed.url" ng-show="Navigation.getFeedUnreadCount(feed.id) > 0 || Navigation.isShowAll() || Navigation.isFeedActive(feed.id) || !feed.id" data-id="{{ feed.id }}" class="feed with-counter with-menu" - news-draggable-disable="{{ feed.error.length > 0 || !feed.id || feed.deleted || feed.editing}}" + news-draggable-disable="{{ + feed.error.length > 0 || + !feed.id || + feed.deleted || + feed.editing + }}" news-draggable="{ stack: '> li', zIndex: 1000, @@ -38,7 +44,9 @@
-
t('Deleted feed')); ?>: {{ feed.title }}
+
+ t('Deleted feed')); ?>: {{ feed.title }} +
@@ -64,7 +72,8 @@
  • - {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }} + {{ Navigation.getFeedUnreadCount(feed.id) | + unreadCountFormatter }}
  • @@ -74,15 +83,24 @@
      -
    • -
    • +
    • +
    • +
    • -
    • +
    • +
    • +
    • + title="t('Read all')); ?>"> + +
    diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index 4c0874f9f..20b1978ac 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -23,20 +23,33 @@
    -
    t('Deleted folder')); ?>: {{ folder.name }}
    +
    + t('Deleted folder')); ?>: {{ folder.name }} +
    + ng-class="{ + 'folder-rename-error': + folder.renameError || + (folderName != folder.name && + !Navigation.renamingFolder && + Navigation.folderNameExists(folderName)) + }">
    @@ -45,19 +58,28 @@ ng-class="{'entry-loading': Navigation.renamingFolder}" title="t('Rename')); ?>" class="action icon-checkmark" - ng-disabled="folderName != folder.name && !Navigation.renamingFolder && Navigation.folderNameExists(folderName)"> + ng-disabled="folderName != folder.name && + !Navigation.renamingFolder && + Navigation.folderNameExists(folderName)">
    -

    +

    t('Folder exists already!')); ?>

    -

    {{ folder.renameError }}

    +

    + {{ folder.renameError }} +

    + ng-show="!folder.editing && + !folder.error && + !folder.deleted && + folder.id"> {{ folder.name }} @@ -66,12 +88,17 @@
    + ng-show="folder.id && + !folder.editing && + !folder.error && + !folder.deleted">
    • - {{ Navigation.getFolderUnreadCount(folder.id) | unreadCountFormatter }} + {{ Navigation.getFolderUnreadCount(folder.id) | + unreadCountFormatter }}
    • @@ -81,19 +108,30 @@
        -
      • -
      • +
      • +
      • +
      • -
      • +
      • +
      • +
      • + title="t('Read all')); ?>"> + +
        - inc('part.navigation.feed', ['folderId' => 'folder.id'])); ?> + inc('part.navigation.feed', ['folderId' => 'folder.id']) + ); ?>
      diff --git a/templates/part.navigation.unreadfeed.php b/templates/part.navigation.unreadfeed.php index fc62427cd..8eae37eed 100644 --- a/templates/part.navigation.unreadfeed.php +++ b/templates/part.navigation.unreadfeed.php @@ -19,7 +19,11 @@ title="{{ Navigation.getUnreadCount() }}"> {{ Navigation.getUnreadCount() | unreadCountFormatter }}
    • -
    • +
    • + +
    diff --git a/templates/part.settings.php b/templates/part.settings.php index 890eb0d2b..00b7b79aa 100644 --- a/templates/part.settings.php +++ b/templates/part.settings.php @@ -13,28 +13,34 @@

    @@ -51,7 +57,8 @@ class="icon-upload svg button-icon-label" news-trigger-click="#opml-upload" ng-class="{'entry-loading': Settings.isOPMLImporting}" - ng-disabled="Settings.isOPMLImporting || Settings.isArticlesImporting"> + ng-disabled= + "Settings.isOPMLImporting || Settings.isArticlesImporting">

    - t('Error when importing: file does not contain valid OPML')); ?> + t('Error when importing: file does not contain valid OPML') + ); ?>

    @@ -84,11 +93,13 @@ -
    @@ -101,7 +112,9 @@

    - t('Error when importing: file does not contain valid JSON')); ?> + t('Error when importing: file does not contain valid JSON') + ); ?>

  • -- cgit v1.2.3