Changeset 206

Show
Ignore:
Timestamp:
01/28/09 22:18:22 (10 months ago)
Author:
cedenoj
Message:

refs #2887, #3026 Applying these changesets to the branch so that we
can create a tag from them.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • elgg/branches/20090118-r198/mod/template/templates/Default_Template/css

    r130 r206  
    276276} 
    277277 
    278 /* 
    279         FOOTER 
    280 */ 
    281  
    282 div#footer { 
    283         clear: both; 
    284         position: relative; 
    285         font-size:1em; 
    286         height:26px; 
    287         margin:20px 0 0 0; 
    288         color:#174764; 
    289         font-weight:bold; 
    290         width:100%; 
    291         padding:3px 0 0 0; 
    292         background:url({{url}}mod/template/templates/Default_Template/images/footer.png) repeat-x; 
    293 } 
    294  
    295 div#footer img { 
    296    text-align:right; 
    297    padding:3px 0 0 0; 
    298 } 
    299  
    300 div#footer p { 
    301    padding:0 20px 0 20px; 
    302 } 
    303  
    304 div#footer a { 
    305         color:#fff; 
    306         padding:0 5px 0 5px; 
    307 } 
    308  
    309 div#footer a:hover { 
    310         text-decoration:underline; 
    311 } 
    312  
    313 div#footer a:link, div#footer a:visited { 
    314         text-align:right; 
    315 } 
    316 #footer :link, #footer :visited { 
    317         color:#000000; 
    318 } 
    319278/* 
    320279        SYSTEM MESSAGES 
  • elgg/branches/20090118-r198/mod/template/templates/Default_Template/pageshell

    r130 r206  
    4949</div><!-- close content-holder div --> 
    5050</div><!-- close container div --> 
    51 <div id="footer"><!-- start footer --> 
    52         <div id="footer-inner"> 
    53                 <p><!--<a href="http://elgg.org/"><img src="{{url}}mod/template/icons/elgg_powered.png" title="Elgg powered" border="0" alt="Elgg powered" align="left"/></a>--> 
    54                  <a href="{{url}}content/terms.php">Terms and conditions</a>&nbsp;|&nbsp;<a href="{{url}}content/privacy.php">Privacy Policy</a> 
    55                 {{perf}} 
    56         </div> 
    57 </div><!-- end footer --> 
     51<!-- start footer --> 
     52<div id="footer"> 
     53<hr /> 
     54<a id="tracpowered" href="http://trac.edgewall.org/"><img src="/projects/admin/chrome/common/trac_logo_mini.png" height="30" width="107" 
     55alt="Trac Powered"/></a> 
     56<p class="left"> 
     57Powered by <a href="/projects/admin/about"><strong>Trac 0.10.3</strong></a><br /> 
     58By <a href="http://www.edgewall.org/">Edgewall Software</a>. 
     59</p> 
     60<p> 
     61<a href="http://elgg.org/"><img src="{{url}}mod/template/icons/elgg_powered.png" title="Elgg powered" border="0" alt="Elgg powered" align="left"/></a>&nbsp; 
     62</p> 
     63<p> 
     64<a href="{{url}}content/terms.php">Terms and conditions</a><br /><a href="{{url}}content/privacy.php">Privacy Policy</a> 
     65</p> 
     66<p> 
     67<a href="http://www.nsf.gov/"><img src="{{url}}mod/template/templates/Default_Template/images/nsf.gif" height="40"  
     68    alt="Sponsored by: NSF"/></a> 
     69Sponsored by: NSF <br />under project: CCF-0722362</p> 
     70</div> 
     71<!-- end footer --> 
    5872</body> 
    5973</html> 
  • elgg/branches/20090118-r198/mod/toolbar/css

    r193 r206  
    2424.rb { border-right:1px solid #5D5D5D;} 
    2525 
     26/* Footer */ 
     27div#footer { 
     28        clear: both; 
     29        position: relative; 
     30    font-size:10px !important; 
     31        margin:20px 0 0 0; 
     32        color:#bbb !important; 
     33        width:100%; 
     34        padding:3px 0 0 0; 
     35    height:80px; 
     36    background:none; 
     37} 
     38 
     39div#footer img { 
     40   text-align:right; 
     41   padding:3px 0 0 0; 
     42} 
     43 
     44div#footer img { 
     45   float:left; 
     46} 
     47 
     48div#footer p { 
     49   border-right:1px solid #D7D7D7; 
     50   float:left; 
     51   padding:0 1em; 
     52} 
     53 
     54div#footer a { 
     55        color:#bbb; 
     56        padding:0px; 
     57} 
     58 
     59div#footer a:hover { 
     60        text-decoration:underline; 
     61} 
     62 
     63div#footer a:link, div#footer a:visited { 
     64        text-align:right; 
     65} 
     66#footer :link, #footer :visited { 
     67        color:#bbb; 
     68} 
     69 
     70 
    2671</style> 
  • elgg/branches/20090118-r198/mod/toolbar/toolbar.inc

    r198 r206  
    77        <li class="rb"><a href="/social">Home</a></li> 
    88        <li class="rb"><a href="/projects">Projects</a></li> 
     9        <li class="rb"><a href="/social/mod/browser/index.php?display=communities">Communities</a></li> 
     10        <li class="rb"><a href="/social/mod/browser/index.php?display=users">People</a></li> 
    911{{myprofile}} 
    1012        <li class="rb"><a href="/social/mod/marketplace">Marketplace</a></li>