Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master

Conflicts: app/assets/javascripts/discourse/templates/header.hbs
2014-10-08 13:48:26 -04:00
parent a059da5d39 75cf1a1953
commit b2d478a6fc
2 changed files with 22 additions and 10 deletions
@@ -95,9 +95,6 @@
    {{#if showExtraInfo}}
      <div class="extra-info-wrapper">
        <div {{bind-attr class=":extra-info hasCategory"}}>
-          {{#if showStarButton}}
-            <a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
-          {{/if}}
          <div class="title-wrapper">
            <h1>
              {{#if showPrivateMessageGlyph}}
@@ -105,13 +102,16 @@
              {{/if}}

              {{#if topic.details.loaded}}
+                {{#if showStarButton}}
+                  <a {{bind-attr class=":star topic.starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="topic.starTooltip"}}></a>
+                {{/if}}
                {{topic-status topic=topic}}
                <a class='topic-link' href='{{unbound topic.url}}' {{action "jumpToTopPost"}}>{{{topic.fancy_title}}}</a>
              {{else}}
                {{#if topic.errorLoading}}
-                  {{topic.errorTitle}}
+                  <span class="error">{{topic.errorTitle}}</span>
                {{else}}
-                  {{i18n topic.loading}}
+                  <span class="loading">{{i18n topic.loading}}</span>
                {{/if}}
              {{/if}}
            </h1>