#563 move mystream to top of left menu
Merged 6 years ago by abompard. Opened 6 years ago by ryanlerch.
ryanlerch/fedora-hubs move-my-stream  into  develop

file modified
+7 -7
@@ -113,6 +113,13 @@ 

        {% if g.auth.logged_in %}

        <ul class="nav nav-pills flex-lg-column mb-3 rounded" id="vertical-navbar" role="navigation">

          <li class="nav-item">

+           <a class="nav-link {% if request.path.endswith(url_for("stream")) %}active{% endif %}"

+               href="{{ url_for("stream") }}">

+             <span><i class="fa fa-comment" aria-hidden="true"></i></span>

+             My Stream

+           </a>

+         </li>

+         <li class="nav-item">

            <a class="nav-link {% if request.path.endswith('/' + g.user.username + '/') %}active{% endif %}"

               href="{{ url_for("hub", hub_name=g.user.username, hub_type="u") }}">

              <span><i class="fa fa-home" aria-hidden="true"></i></span>
@@ -120,13 +127,6 @@ 

            </a>

          </li>

          <li class="nav-item">

-           <a class="nav-link {% if request.path.endswith(url_for("stream")) %}active{% endif %}"

-              href="{{ url_for("stream") }}">

-             <span><i class="fa fa-comment" aria-hidden="true"></i></span>

-             My Stream

-           </a>

-         </li>

-         <li class="nav-item">

              <a class="nav-link" href="{{ url_for("groups") }}">

                <span><i class="fa fa-users" aria-hidden="true"></i></span>

                All groups

@@ -11,18 +11,18 @@ 

        leftMenuEntries.push(

          (

            <LeftMenuEntry

-             key={this.props.user.hub}

-             url={this.props.user.hub}

-             icon="home"

-             text="My Hub"

-             />

-         ), (

-           <LeftMenuEntry

              key={this.props.user.stream}

              url={this.props.user.stream}

              icon="comment"

              text="My Stream"

-             />

+           />

+         ), (

+           <LeftMenuEntry

+             key={this.props.user.hub}

+             url={this.props.user.hub}

+             icon="home"

+             text="My Hub"

+           />

          ), (

            <LeftMenuEntry

              key="All groups"

Any reason for changing the indentation here?

rebased onto 08ba7bf

6 years ago

abompard commented 18 hours ago
Any reason for changing the indentation here?

nope :/ good catch! fixed and rebased!

Commit e0014a6 fixes this pull-request

Pull-Request has been merged by abompard

6 years ago

Pull-Request has been merged by abompard

6 years ago