Mostly got a sidebar on the left working, for submenu.
Modifications to the templates to take advantage of new submenu. Some content changes with "about" section, where I was implementing the changes.
This commit is contained in:
		
							parent
							
								
									f7c22b3f16
								
							
						
					
					
						commit
						f426e60136
					
				
					 5 changed files with 74 additions and 25 deletions
				
			
		|  | @ -1,6 +1,6 @@ | ||||||
| {% extends "base_conservancy.html" %} | {% extends "base_about.html" %} | ||||||
| {% block subtitle %}Contact - {% endblock %} | {% block subtitle %}Contact - {% endblock %} | ||||||
| {% block category %}contact{% endblock %} | {% block submenuselection %}Contact{% endblock %} | ||||||
| {% block content %} | {% block content %} | ||||||
| 
 | 
 | ||||||
| <h1>Contact the Conservancy</h1> | <h1>Contact the Conservancy</h1> | ||||||
|  |  | ||||||
|  | @ -1,14 +1,12 @@ | ||||||
| {% comment %}THIS PAGE IS UNLINKED | {% extends "base_about.html" %} | ||||||
| {% extends "base_conservancy.html" %} |  | ||||||
| {% block subtitle %}About - {% endblock %} | {% block subtitle %}About - {% endblock %} | ||||||
| {% block content %} | {% block content %} | ||||||
| 
 | 
 | ||||||
| <h1>About</h1> | <h1>About</h1> | ||||||
| 
 | 
 | ||||||
| <p>The Software Freedom Conservancy, Inc. is a not-for-profit organization | <p>The Software Freedom Conservancy, Inc. is a 501(c)(3) not-for-profit | ||||||
| that promotes the use and development of free and open source software by | organization incorporated in New York.  Conservancy is managed by | ||||||
| providing a range of pro-bono services to Free, Libre and Open Source | its <a href="/about/board/"> board of directors.</a></p> | ||||||
| Software (FLOSS) projects.</p> |  | ||||||
| 
 | 
 | ||||||
| <p>We hold, protect and manage copyrights and trademarks for FLOSS | <p>We hold, protect and manage copyrights and trademarks for FLOSS | ||||||
| projects.  Conservancy aims to act as long-term caretakers for our member | projects.  Conservancy aims to act as long-term caretakers for our member | ||||||
|  | @ -48,4 +46,3 @@ inspection:</p> | ||||||
| 
 | 
 | ||||||
| </ul></p> | </ul></p> | ||||||
| {% endblock %} | {% endblock %} | ||||||
| {% endcomment %} |  | ||||||
|  |  | ||||||
|  | @ -11,7 +11,7 @@ p, h1, h2, h3, h4, h5, h6, #mainContent ul, #mainContent ol { | ||||||
| 
 | 
 | ||||||
| body { | body { | ||||||
|   font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif; |   font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif; | ||||||
|   font-size: 90%; |   font-size: 95%; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| a { text-decoration: none; color: #146624; } | a { text-decoration: none; color: #146624; } | ||||||
|  | @ -22,7 +22,7 @@ h2 { margin-top: .75em; margin-bottom: .5em; } | ||||||
| h3 { margin-top: .6em; margin-bottom: .4em; } | h3 { margin-top: .6em; margin-bottom: .4em; } | ||||||
| 
 | 
 | ||||||
| #mainContent h1 { border-bottom: 1px solid #00334b; } | #mainContent h1 { border-bottom: 1px solid #00334b; } | ||||||
| h2 { border-bottom: 1px solid #aaa; } | #mainContent h2 { border-bottom: 1px solid #aaa; } | ||||||
| 
 | 
 | ||||||
| #mainContent ul, #mainContent ol { padding-left: 1.5em; } | #mainContent ul, #mainContent ol { padding-left: 1.5em; } | ||||||
| 
 | 
 | ||||||
|  | @ -93,36 +93,51 @@ body.conservancy-contact #navbar ul li.contact a, | ||||||
| body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */ | body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */ | ||||||
|       { background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; } |       { background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; } | ||||||
| 
 | 
 | ||||||
|  | #mainContent { | ||||||
|  |     margin-left: 50px; | ||||||
|  |     margin-right: 50px; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| #container { | #container { | ||||||
|     width: 100%; |     width: 100%; | ||||||
|  |     overflow: hidden; | ||||||
| } | } | ||||||
| #container #mainContent { | #container #mainContent { | ||||||
|     background: #fffff; |     background: #fffff; | ||||||
|     margin-left: 200px; |     margin-left: 210px; | ||||||
|  |     margin-right: 50px; | ||||||
|     padding-bottom: 32767px; |     padding-bottom: 32767px; | ||||||
|     margin-bottom: -32767px; |     margin-bottom: -32767px; | ||||||
| } | } | ||||||
| #container #sidebar { | #container #sidebar { | ||||||
|     width: 200px; |     width: 200px; | ||||||
|     float: left; |     float: left; | ||||||
|     background-color: #e5e5e5;  |  | ||||||
|     padding-bottom: 32767px; |     padding-bottom: 32767px; | ||||||
|     margin-bottom: -32767px; |     margin-bottom: -32767px; | ||||||
|  |     background-color: #e5e5e5;  | ||||||
| } | } | ||||||
|  | 
 | ||||||
| #container #sidebar li { | #container #sidebar li { | ||||||
|     text-align: center; |     text-align: center; | ||||||
|     list-style: none; |     list-style: none; | ||||||
|     padding: 3px 10px 3px 10px;  |     padding: 3px 10px 3px 10px;  | ||||||
|     margin: 5px;  |     margin: 5px;  | ||||||
|     border: 1px solid #CCC; |     border: 1px solid #CCC; | ||||||
|  |     background: #fff url(/img/nav-bg.png) bottom repeat-x; | ||||||
| } | } | ||||||
| #container #sidebar li#selected { | 
 | ||||||
|  | #container #sidebar.Directors ul li.Directors, | ||||||
|  | #container #sidebar.Contact ul li.Contact, | ||||||
|  | #container #sidebar.Officers ul li.Officers, | ||||||
|  | #container #sidebar.Staff ul li.Staff | ||||||
|  | { | ||||||
|     color: #000033; |     color: #000033; | ||||||
|     font-weight: bold; |     font-weight: bold; | ||||||
|  |     background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; | ||||||
| } | } | ||||||
| #container #sidebar h2 { | #container #sidebar h2 { | ||||||
|     text-align: center; |     text-align: center; | ||||||
|     font-size: 140%; |     font-size: 150%; | ||||||
|     margin: 1.5em 0 0.8em 0; |     margin: 1.5em 0 0.8em 0; | ||||||
| } | } | ||||||
| #container #sidebar hr { | #container #sidebar hr { | ||||||
|  | @ -212,12 +227,13 @@ span.subsectionToc { padding-left: 4em; } | ||||||
| span.subsubsectionToc { padding-left: 6em;} | span.subsubsectionToc { padding-left: 6em;} | ||||||
| .js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; } | .js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; } | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| body.conservancy-overview #navbar ul li.overview a, | body.conservancy-overview #navbar ul li.overview a, | ||||||
| body.conservancy-members #navbar ul li.members a, | body.conservancy-members #navbar ul li.members a, | ||||||
| body.conservancy-news #navbar ul li.news a, | body.conservancy-news #navbar ul li.news a, | ||||||
| body.conservancy-directors #navbar ul li.directors a, | body.conservancy-About #navbar ul li.About a, | ||||||
| body.conservancy-officers #navbar ul li.officers a, | body.conservancy-officers #navbar ul li.officers a, | ||||||
| body.conservancy-contact #navbar ul li.contact a, | body.conservancy-contact #navbar ul li.contact a, | ||||||
| body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */ | body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */ | ||||||
|   { background: #fff url(http://www.softwarefreedom.org/img/nav-bg-up.png) top repeat-x; color: #000; } | {  | ||||||
|  |     font-weight: bold; | ||||||
|  |     background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; } | ||||||
|  |  | ||||||
							
								
								
									
										40
									
								
								www/conservancy/templates/base_about.html
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								www/conservancy/templates/base_about.html
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,40 @@ | ||||||
|  | {% | ||||||
|  | # Copyright 2005-2008, James Garrison | ||||||
|  | # Copyright 2010, Bradley M. Kuhn | ||||||
|  | 
 | ||||||
|  | # This software's license gives you freedom; you can copy, convey, | ||||||
|  | # propagate, redistribute, modify and/or redistribute modified versions of | ||||||
|  | # this program under the terms of the GNU Affero General Public License | ||||||
|  | # (AGPL) as published by the Free Software Foundation (FSF), either | ||||||
|  | # version 3 of the License, or (at your option) any later version of the | ||||||
|  | # AGPL published by the FSF. | ||||||
|  | # | ||||||
|  | # This program is distributed in the hope that it will be useful, but | ||||||
|  | # WITHOUT ANY WARRANTY; without even the implied warranty of | ||||||
|  | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero | ||||||
|  | # General Public License for more details. | ||||||
|  | # | ||||||
|  | # You should have received a copy of the GNU Affero General Public License | ||||||
|  | # along with this program in a file in the toplevel directory called | ||||||
|  | # "AGPLv3".  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  | 
 | ||||||
|  | # req.subprocess_env is not set when the PostReadRequestHandler runs, | ||||||
|  | # so we just bypass it altogether and set the relevant variable here. | ||||||
|  | # See deployment documentation for more info. | ||||||
|  | 
 | ||||||
|  | {% extends "base_conservancy.html" %} | ||||||
|  | {% block outercontent %} | ||||||
|  |     <div id="container"> | ||||||
|  |          <div id="sidebar" class="{% block submenuselection %}other{% endblock %}"> | ||||||
|  |             <h2>{% block category %}About{% endblock %}</h2> | ||||||
|  |             <ul> | ||||||
|  |             <li class="Contact"><a href="/about/contact">Contact</a></li> | ||||||
|  |             <li class="Directors"><a href="/about/board/">Directors</a></li> | ||||||
|  |             <li class="Officers"><a href="/about/officers/">Officers</a></li> | ||||||
|  |             <li class="Staff"><a href="/about/officers/">Staff</a></li> | ||||||
|  |             </ul> | ||||||
|  |          </div> | ||||||
|  |                <div id="mainContent">{% block content %}{% endblock %} | ||||||
|  |                </div> | ||||||
|  |    </div> | ||||||
|  | {% endblock %} | ||||||
|  | @ -22,17 +22,13 @@ | ||||||
|           <li class="overview"><a href="/overview/">Overview</a></li> |           <li class="overview"><a href="/overview/">Overview</a></li> | ||||||
| 	  <li class="members"><a href="/members/">Member Projects</a></li> | 	  <li class="members"><a href="/members/">Member Projects</a></li> | ||||||
|           <li class="news"><a href="/news/">News</a></li> |           <li class="news"><a href="/news/">News</a></li> | ||||||
|           <li class="directors"><a href="/about/team/board/">Directors</a></li> |           <li class="About"><a href="/about/">About</a></li> | ||||||
| 	  <li class="officers"><a href="/about/team/officers/">Officers</a></li> | 	  <li class="donate"><a href="/donate/">Support Conservancy!</a></li> | ||||||
|           <li class="contact"><a href="/about/contact/">Contact</a></li> |  | ||||||
| 	  <li class="donate"><a href="/donate/">Donations</a></li> |  | ||||||
| 	</ul> | 	</ul> | ||||||
|       </div> |       </div> | ||||||
|       <div id="navbar-clear"></div> |       <div id="navbar-clear"></div> | ||||||
|     </div> |     </div> | ||||||
|     <div id="mainContent"> |       {% block outercontent %}<div id="mainContent">{% block content %}{% endblock %}</div>{% endblock %} | ||||||
|       {% block outercontent %}<div class="singleColumn">{% block content %}{% endblock %}</div>{% endblock %} |  | ||||||
|     </div> |  | ||||||
|     <div id="conservancyfooter"> |     <div id="conservancyfooter"> | ||||||
|       <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/news/">News Feed</a></p> |       <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/news/">News Feed</a></p> | ||||||
|       <p class="copyright_info">This page is licensed under the <a href="http://creativecommons.org/licenses/by-nc-nd/2.0/">Creative Commons Attribution-NonCommercial-NoDerivs 2.0 license</a>.</p> |       <p class="copyright_info">This page is licensed under the <a href="http://creativecommons.org/licenses/by-nc-nd/2.0/">Creative Commons Attribution-NonCommercial-NoDerivs 2.0 license</a>.</p> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Bradley M. Kuhn
						Bradley M. Kuhn