Changeset 986

Show
Ignore:
Timestamp:
11/17/08 21:18:00 (7 weeks ago)
Author:
clay
Message:

Changed css and layout for portfolio pages. Added some more screenshot circles.

Location:
huginmunin/trunk/web/hm/app
Files:
4 added
8 modified

Legend:

Unmodified
Added
Removed

  • huginmunin/trunk/web/hm/app/media/css/general.css

    r985 r986  
    7676} 
    7777 
     78.top_control_button { 
     79        margin: 0 3em; 
     80        float: right; 
     81        width: 9em; 
     82} 
     83 
    7884.new_tag { 
    7985        margin: 0 0em -2em 0em; 
    … …  
    118124} 
    119125 
     126.wide_image { 
     127        width: 95%; 
     128} 
     129 
    120130.intro_banner_spacer { 
    121131        width: 670px; 
    … …  
    456466} 
    457467 
     468.big_spacer { 
     469        padding: 13em; 
     470} 
     471 
    458472.spacer { 
    459473        padding: 1em; 
    … …  
    537551        border:0; 
    538552        margin-left:.55em; 
    539  
    540 } 
    541 #spacer{ 
    542         height:0em; 
    543553} 
    544554 
    … …  
    577587} 
    578588 
    579 .howwork p{ 
     589.howwork p { 
    580590        padding-left:2%; 
    581591        padding-right:2%; 

  • huginmunin/trunk/web/hm/app/templates/intro/learn_2.html

    r985 r986  
    1818<div class="intro_paragraph_area">               
    1919        <h2>Your <a href="{% url intro part="learn_portfolio" %}">Portfolio</a></h2> 
    20                 <h3>lets your customize bilumi scores based on specific ethical interests.</h3>  
     20                <h3>customize bilumi scores based on your specific ethical interests.</h3>       
    2121</div>           
    2222 
    … …  
    3232<div> 
    3333        <a href="{% url intro part="learn_text" %}">                     
    34                 <img alt="" class="small_intro_circle" src="/Main/media/img/screenshots/Circle_Research_Guide_1.png"></a> 
     34                <img alt="" class="small_intro_circle" src="/Main/media/img/screenshots/Circle_Text_Message.png"></a> 
    3535</div> 
    3636<div class="intro_paragraph_area">                       
    37         <h2>Our <a href="{% url intro part="learn_text" %}">Text Message</a></h2> 
    38                 <h3>demo lets you use a normal cell phone to access our database.</h3> 
     37        <h2>Try a <a href="{% url intro part="learn_text" %}">Text Message</a></h2> 
     38                <h3>demo to access our database with a normal cellphone.</h3> 
    3939</div> 
    4040 

  • huginmunin/trunk/web/hm/app/templates/intro/learn_text.html

    r985 r986  
    1616                <img alt="" src="http://bilumi.org/blog/wp-content/uploads/CommemorativeCode.png"></a>   
    1717</div> 
    18 <div class="intro_paragraph_area">               
    19         <h2>This is a working <a href="http://bilumi.org/blog/2008/05/30/text-message-us/">                      
    20 demo</a></h2> 
    21                 <h3>Want to get product and company information while in the store? Text message a barcode, eg 18675309, to 
     18<div>            
     19        <h2>This <a href="http://bilumi.org/blog/2008/05/30/text-message-us/">                   
     20demo</a> currently only works for this particular chocolate bar.</h2> 
     21                <h3>Want product and company information while in the store? Text messaging this product's barcode - 18675309 - to 
     22                        <b>score@bilumi.org</b> to find out what our database has to say. 
    2223 
    23 <h2>score@bilumi.org</h2> 
    24  
    25 to find out what our database has to say. 
    26  
    27 <br>Development on the SMS service has only just started, but we are making fast progress.</h3>  
     24<br><p>Development on the SMS service has only just started.  We need to finish hooking up a UPC database to make it work for every product.</p>         
    2825</div>           
    2926 

  • huginmunin/trunk/web/hm/app/templates/intro/share_1.html

    r985 r986  
    1313<div class="intro_paragraph_area">       
    1414         
    15         <div id="stepone" class="howwork"><img class="firstimage" src="/Main/media/img/stepone.png" alt="Let other consumers learn what you know" /> 
     15        <div id="stepone" class="howwork"><img class="firstimage" src="/Main/media/img/stepone.png" alt="Let other consumers learn what you know" > 
    1616                <p><i>You</i> can publish <b>reviews</b> about the effects of a company's business practices based on specific consumer interests.</p> 
    1717        </div> 
    1818         
    1919        <div id="steptwo" class="howwork"> 
    20                 <img src="/Main/media/img/steptwo.png" alt="rate other reviews" /> 
     20                <img src="/Main/media/img/steptwo.png" alt="rate other reviews" > 
    2121                <p><i>You</i> can use reviews to <b>rate</b> a company's behavior within specific interest categories on a scale <i>of 1-9.</i></p> 
    2222        </div> 

  • huginmunin/trunk/web/hm/app/templates/intro/support_1.html

    r985 r986  
     1{% extends "browse_extension.html" %} 
     2 
     3{% block big_box %} 
     4 
     5<div class="intro_paragraph_area">       
     6        <h1>Support our Community! 
     7        </h1> 
     8        <h3>Bilumi is brought to you by ordinary people. </h3>  
     9        <div class="inner" > 
     10                        <p>With the grassroots involvement of people like you we can forever change the way that corporations spend our money.</p> 
     11                        <p>We've logged over 6000 volunteer hours getting our service up and running.   
     12                                We're committed to nothing less than providing mainstream access to tools for responisble shopping. 
     13                        </p> 
     14                        <p>Bilumi is non-profit, open-source, and open-content.  We believe that individuals with access to collective knowledge will change the world.</p>      
     15        </div>           
     16</div> 
     17 
     18<span class="bubble_button"> 
     19                <a href="{% url intro part="support_2" %}">                      
     20                        <img alt="Continue with Intro" class="arrow_button" src="/Main/media/img/buttons/Next.png"></a> 
     21                <a href="{% url intro part="support_2" %}">                      
     22                        <img alt="Continue with Intro" class="arrow_button" src="/Main/media/img/buttons/Next_Mouse_Over.png"></a> 
     23</span>  
     24         
     25<div class="big_spacer"> 
     26        </div> 
     27<div> 
     28<p align="center"><img class="wide_image" alt="Heads of bilumi contributors" src="http://bilumi.org/blog/wp-content/uploads/HeadsLong.png" ></p> 
     29</div> 
     30{% endblock %} 

  • huginmunin/trunk/web/hm/app/templates/intro/support_2.html

    r985 r986  
     1{% extends "intro_extension.html" %} 
     2 
     3{% block big_box %} 
     4 
     5        <h1>How Can You Help? 
     6        </h1>  
     7        <h3>Invest in us now and just watch what we can do together. 
     8        </h3> 
     9 
     10<div class="spacer"> 
     11</div> 
     12         
     13<div> 
     14        <a href="{% url intro part="learn_portfolio" %}">                        
     15                <img alt="" class="small_intro_circle" src="/Main/media/img/screenshots/Circle_Quick_Rate_1.png"></a>    
     16</div> 
     17<div class="intro_paragraph_area">               
     18        <h2><a href="{% url intro part="learn_portfolio" %}">Donate</a></h2> 
     19                <h3>through paypal.  It's tax deductible.</h3>   
     20</div>           
     21 
     22<div class="intro_paragraph_area">                       
     23        <h2><a href="{% url intro part="learn_browse" %}">Plan</a> Workshops and Classes</h2> 
     24                <h3>reviewing and rating companies on bilumi.org.  Working in a group is fun and online peer review is a great way to get better.</h3> 
     25</div>   
     26<div> 
     27        <a href="{% url intro part="learn_browse" %}">                   
     28                <img alt="" class="small_intro_circle" src="/Main/media/img/screenshots/Circle_Browse_1.png"></a> 
     29</div>           
     30 
     31<div> 
     32        <a href="{% url intro part="learn_about" %}">                    
     33                <img alt="" class="small_intro_circle" src="/Main/media/img/screenshots/Circle_About_1.png"></a> 
     34</div> 
     35<div class="intro_paragraph_area">                       
     36        <h2><a href="{% url intro part="learn_about" %}">Volunteer</a></h2> 
     37                <h3>whatever skills and time you have.  Whether you like to draw, teach, or through parties - there's lots to do for everyone.</h3>      
     38</div> 
     39 
     40<div class="intro_paragraph_area">                       
     41        <h2><a href="{% url intro part="learn_about" %}">Develop</a> our Technology.</h2> 
     42                <h3>Volunteer programmers have brought us this far and you can take us to the next level.</h3>   
     43</div> 
     44<div> 
     45        <a href="{% url intro part="learn_about" %}">                    
     46                <img alt="" class="small_intro_circle" src="/Main/media/img/screenshots/Circle_About_1.png"></a> 
     47</div> 
     48 
     49<div> 
     50        <a href="{% url intro part="learn_text" %}">                     
     51                <img alt="" class="small_intro_circle" src="/Main/media/img/screenshots/Circle_Text_Message.png"></a> 
     52</div> 
     53<div class="intro_paragraph_area">                       
     54        <h2><a href="{% url intro part="learn_text" %}">Spread</a> the Word</h2> 
     55                <h3>so everyone can use our service.</h3> 
     56</div> 
     57                 
     58{% endblock %} 

  • huginmunin/trunk/web/hm/app/templates/user/portfolio_display.html

    r969 r986  
    22 
    33{% block big_box %} 
    4 <div class="Box_Title"> 
     4<div> 
    55{% if mirror %} 
    6         <h2 class="box_top">My Portfolio</h2> 
     6        <h1>My Portfolio</h1> 
     7        <a href="{% url edit_portfolio user_id %}"> 
     8                        <img alt="cancel" class="control_button" src="/Main/media/img/buttons/Edit.png"></a> 
    79{% else %} 
    8         <h2 class="box_top">{{ datauser.username }}&#39;s Portfolio</h2> 
     10        <h1>{{ datauser.username }}&#39;s Portfolio</h1> 
    911{% endif %} 
    1012 
    1113        {% if show_portfolio %} 
    12                 <UL> 
     14                 
    1315                {% for w in interests %} 
    14                         <LI>{% if w.active %}{{ w.interest.label }}: {{ w.percent }}% {% endif %}</LI> 
     16                        <h2>{% if w.active %}{{ w.interest.label }}: {{ w.percent }}% </h2> 
     17                        <h3>{{ w.interest.description }}{% endif %}</h3> 
    1518                {% endfor %} 
    16                 </UL> 
     19                 
    1720        {% else %} 
    18             <P>This portfolio is not public. View <A HREF=" 
     21            <h2>This portfolio is not public. View <A HREF=" 
    1922                {% if user.is_authenticated %}{% url portfolio user.id %} 
    2023                {% else %}{% url login %} 
    21                 {% endif %}">your porfolio</A></P> 
     24                {% endif %}">your porfolio</A></h2> 
    2225        {% endif %} 
    2326         
    24         {% if mirror %}<p><a href="{% url edit_portfolio user_id %}">Edit</a></p>{% endif %} 
     27        {% if mirror %} 
     28                <a href="{% url edit_portfolio user_id %}"> 
     29                        <img alt="cancel" class="top_control_button" src="/Main/media/img/buttons/Edit.png"></a> 
     30        {% endif %} 
    2531 
    2632</div> 

  • huginmunin/trunk/web/hm/app/templates/user/portfolio_edit.html

    r943 r986  
    66{% block big_box %} 
    77 
    8 <div class="Box_Title"> 
    9  
     8<h1> Portfolio edit</h1> 
     9<h3> Design your own consumer portfolio by assigning a percentage value to the following interests.</h3> 
     10<div> 
    1011        <div class="debug"></div> 
    1112        <div class="form_error">{% if form.errors %}{{ form.errors }}{% endif %}</div> 
    … …  
    1516                <!-- hidden data that view needs to process forms --> 
    1617                {{ management_form }} 
    17                 <table> 
     18                        <a href="{% url portfolio user_id %}"> 
     19                                        <img alt="cancel" class="top_control_button" src="/Main/media/img/buttons/Cancel.png"></a>                       
     20                        <span class="top_control_button"><input type="image" alt="submit" src="/Main/media/img/buttons/Submit.png"> 
     21                        </span> 
    1822                        {% for form in forms %} 
    19                                 <TR><TD>{{ form.interest_name }}: <SMALL>{{ form.interest_description }}</SMALL></TD><TD>{{ form.percent }} 
    20                                         <!-- form.id is a hidden but necessary input -->{{ form.id }}</TD></TR> 
     23                                <div> 
     24                                        <h2>{{ form.interest_name }}: {{ form.percent }}</h2>  
     25                                        <h3>{{ form.interest_description }}</h3> 
     26                                        <!-- form.id is a hidden but necessary input -->{{ form.id }} 
     27                                </div>   
    2128                        {% endfor %} 
    22                         <tr> 
    23                                 <td><input type="submit"></td> 
    24                                 <td><a href="{% url portfolio user_id %}">Cancel</a></td> 
    25                         </tr> 
    26                          
    27                 </table> 
     29                        <a href="{% url portfolio user_id %}"> 
     30                                        <img alt="cancel" class="top_control_button" src="/Main/media/img/buttons/Cancel.png"></a>                       
     31                        <span class="top_control_button"><input type="image" alt="submit" src="/Main/media/img/buttons/Submit.png"> 
     32                        </span> 
     33                 
    2834        </form> 
    2935