public listing links

coco-project · Aug 11, 2015 · fe8bd4a · fe8bd4a
1 parent 53104d2
commit fe8bd4a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/ipynbsrv/settings.py b/ipynbsrv/settings.py
@@ -121,7 +121,7 @@
 # LEGACY SETTINGS FROM OLD IPYNBSRV. NEEDS REFACTORING
 LOGIN_URL = '/accounts/login'
 LOGIN_REDIRECT_URL = '/accounts/flag'
-
+PUBLIC_URL = '/public/'
 
 VARS_MODULE_PATH = 'ipynbsrv.core.conf'
 

diff --git a/ipynbsrv/web/templates/web/snippets/navbar.html b/ipynbsrv/web/templates/web/snippets/navbar.html
@@ -22,32 +22,25 @@
                 <li><a href="/notifications">Notifications {% if new_notifications_count >= 0 %}<span id="notification_bubble">{{ new_notifications_count }}</span>{% endif %}</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-
                 <li class="hidden-xs"><a href="" data-tooltip data-placement="bottom" title="User Guide" target="_blank">
                     <i class="glyphicon glyphicon-question-sign" aria-hidden="true"></i>
                 </a></li>
-                <li class="hidden-xs"><a href="" data-tooltip data-placement="bottom" title="My publications" target="_blank">
+                <li class="hidden-xs"><a href="{% settings 'PUBLIC_URL' %}{% request.user.get_username %}" data-tooltip data-placement="bottom" title="My publications" target="_blank">
                     <i class="glyphicon glyphicon-globe" aria-hidden="true"></i>
                 </a></li>
                 <li class="hidden-xs"><a href="/accounts/logout" data-tooltip data-placement="bottom" title="Logout">
                     <i class="glyphicon glyphicon-log-out" aria-hidden="true"></i>
                 </a></li>
-
-
-                <li class="hidden-sm hidden-md hidden-lg">
-                    <a href="" title="Settings" target="_blank">Settings</a>
-                </li>
-
                 <li class="hidden-sm hidden-md hidden-lg">
                     <a href="" title="User Guide" target="_blank">Use Guide</a>
                 </li>
                 <li class="hidden-sm hidden-md hidden-lg">
-                    <a href="" title="My publications" target="_blank">My publications</a>
+                    <a href="{% settings 'PUBLIC_URL' %}{% request.user.get_username %}" title="My publications" target="_blank">My publications</a>
                 </li>
                 <li class="hidden-sm hidden-md hidden-lg">
                     <a href="/accounts/logout" title="Logout">Logout</a>
                 </li>
             </ul>
         </div>
     </div>
-</nav>
+</nav>
diff --git a/ipynbsrv/web/templates/web/user/login.html b/ipynbsrv/web/templates/web/user/login.html
@@ -39,7 +39,7 @@
                 </div>
                 <button type="submit" class="btn btn-default">Submit</button>
             </form>
-            <p class="login-footnote">An overview of all published notebooks is available under the public listing section <a href="{% settings 'URL_PUBLIC' %}"><strong>here</strong></a>.</p>
+            <p class="login-footnote">An overview of all published notebooks is available under the public listing section <a href="{% settings 'PUBLIC_URL' %}"><strong>here</strong></a>.</p>
         </div>
     </div>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ @@
                     </div>
                     <button type="submit" class="btn btn-default">Submit</button>
                 </form>
-                <p class="login-footnote">An overview of all published notebooks is available under the public listing section <a href="{% settings 'URL_PUBLIC' %}"><strong>here</strong></a>.</p>
+                <p class="login-footnote">An overview of all published notebooks is available under the public listing section <a href="{% settings 'PUBLIC_URL' %}"><strong>here</strong></a>.</p>
             </div>
         </div>
     </div>
@@ Expand Down @@