Summit

Merge lp:~svwilliams/summit/left-bar-navpanel into lp:summit

  1. left-bar-navpanel
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Merged at revision: 313
Proposed branch: lp:~svwilliams/summit/left-bar-navpanel
Merge into: lp:summit
Diff against target: 40 lines (+15/-0)
2 files modified
summit/common/templates/base.html (+12/-0)
summit/media/css/layout.css (+3/-0)
To merge this branch: bzr merge lp:~svwilliams/summit/left-bar-navpanel
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+95802@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/common/templates/base.html'
2--- summit/common/templates/base.html 2012-02-02 14:31:36 +0000
3+++ summit/common/templates/base.html 2012-03-04 21:28:18 +0000
4@@ -83,6 +83,7 @@
5 {% block sub_nav_links %}
6 {% endblock %}
7
8+
9 {% block messages %}
10 {% if messages %}
11 {% for message in messages %}
12@@ -90,6 +91,17 @@
13 {% endfor %}
14 {% endif %}
15 {% endblock %}
16+{% block side_bar %}
17+ <div id="side_bar">
18+ <div id="side_bar_links_container">
19+ <h3>Management Menu</h3>
20+ {% block side_bar_links %}{% endblock %}
21+ <!-- Concept 1: indented div <div style="padding: 2px 8px 0px 8px;font-size:medium"><a href="ubuntu.com">Create a Private Meeting</a></div> -->
22+ <!-- Concept 2: list element <li><a href="ubuntu.com">Create a Private Meeting</a></li> -->
23+ <li><a href="ubuntu.com">Create a Private Meeting</a></li>
24+ </div>
25+ </div>
26+{% endblock %}
27
28 {% block content %}
29 {% endblock %}
30
31=== modified file 'summit/media/css/layout.css'
32--- summit/media/css/layout.css 2011-12-02 02:30:47 +0000
33+++ summit/media/css/layout.css 2012-03-04 21:28:18 +0000
34@@ -32,3 +32,6 @@
35 float: left;
36 list-style-type: none;
37 }
38+
39+
40+

Subscribers

People subscribed via source and target branches