From 5de26540b4f0348719ec93e760ed987f92a60075 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 7 May 2007 13:19:59 +0000 Subject: fixing some bugs changed the way we are handling bookmarks. No order_id required, really! Order by last post time as suggested by BartVB. git-svn-id: file:///svn/phpbb/trunk@7497 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/attachment.html | 2 +- phpBB/styles/prosilver/template/index_body.html | 2 +- phpBB/styles/prosilver/template/mcp_viewlogs.html | 4 +- .../styles/prosilver/template/overall_footer.html | 3 +- .../prosilver/template/ucp_main_bookmarks.html | 80 +++++++++++----------- .../prosilver/template/ucp_main_subscribed.html | 11 ++- .../template/ucp_pm_viewmessage_print.html | 2 +- 7 files changed, 51 insertions(+), 53 deletions(-) (limited to 'phpBB/styles/prosilver/template') diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index a51f1ebc57..9e68274f0b 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -14,7 +14,7 @@
-
{_file.DOWNLOAD_NAME}
+
{_file.DOWNLOAD_NAME}
{_file.COMMENT}
{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 91438ecfbc..d702e88ea4 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -29,7 +29,7 @@

{L_BIRTHDAYS}

-

{L_CONGRATULATIONS}: {BIRTHDAY_LIST}{L_NO_BIRTHDAYS}

+

{L_CONGRATULATIONS}: {BIRTHDAY_LIST}{L_NO_BIRTHDAYS}

diff --git a/phpBB/styles/prosilver/template/mcp_viewlogs.html b/phpBB/styles/prosilver/template/mcp_viewlogs.html index 760981ebf6..862fad9df7 100644 --- a/phpBB/styles/prosilver/template/mcp_viewlogs.html +++ b/phpBB/styles/prosilver/template/mcp_viewlogs.html @@ -18,7 +18,7 @@ - {L_LOGS_CURRENT_TOPIC} {TOPIC_NAME} + {L_LOGS_CURRENT_TOPIC} {TOPIC_NAME} @@ -44,7 +44,7 @@ - +
{PAGE_NUMBER}{L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}{L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 1327110758..cbd2d7ae12 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -1,7 +1,6 @@
- {RUN_CRON_TASK}
@@ -44,5 +43,7 @@
+{RUN_CRON_TASK} + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html index 8278299cd6..6a19d62609 100644 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html @@ -13,51 +13,49 @@

{L_BOOKMARKS_DISABLED}

- -
    -
  • -
    -
    {L_BOOKMARKS}
    -
    {L_LAST_POST}
    -
    {L_MARK}
    -
    {L_MOVE}
    -
    -
    • -
-
    + +
      +
    • +
      +
      {L_BOOKMARKS}
      +
      {L_LAST_POST}
      +
      +
      • +
    +
      - -
    • + +
    • {L_DELETED_TOPIC}
      +
      -
      -
      style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG});"> - {topicrow.TOPIC_TITLE} - {topicrow.UNAPPROVED_IMG} - {REPORTED_IMG}
      - {topicrow.PAGINATION} - {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} {NEWEST_POST_IMG} -
      -
      {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {LAST_POST_IMG}
      - {L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}       -
      -
      - -
      - {L_MOVE_UP} - {L_MOVE_DOWN} -
      - -
      - -
      • - - -
    - -

    {L_NO_BOOKMARKS}

    - +
    +
    + {NEWEST_POST_IMG} {topicrow.TOPIC_TITLE} + {topicrow.UNAPPROVED_IMG} + {REPORTED_IMG}
    + {topicrow.PAGINATION} + {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} +
    +
    {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} + {LAST_POST_IMG}
    {L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}     +
    +
    +
    + + + +
+
    + +
+ +

{L_NO_BOOKMARKS}

+ diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html index bf49116652..d806507e06 100644 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html @@ -50,17 +50,16 @@
  • -
    style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG});"> - {topicrow.TOPIC_TITLE} {topicrow.ATTACH_ICON_IMG} +
    + {NEWEST_POST_IMG} {topicrow.TOPIC_TITLE} {topicrow.UNAPPROVED_IMG} {REPORTED_IMG}
    {topicrow.PAGINATION} - {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} {NEWEST_POST_IMG} + {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME}
    -
    {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {LAST_POST_IMG}
    - {L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}     +
    {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} + {LAST_POST_IMG}
    {L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}
    -
    • diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index d5f26ec436..44b7016d25 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -75,7 +75,7 @@ hr.sep { - + -- cgit v1.2.1
    {L_PM_FROM}: {MESSAGE_AUTHOR} [ {SENT_DATE} ]{MESSAGE_AUTHOR} [ {SENT_DATE} ]