Changeset 985

Show
Ignore:
Timestamp:
11/16/08 14:38:45 (7 weeks ago)
Author:
clay
Message:

Added lots new Intro pages. Added screenshot circle images (in a new file) and placed them around the intro pages. New bubble buttons. Added new flash animation. Removed fla anim from some old intro pages. Worked on quickrate's css and a new extension.

Lucy modified main.py in some way.

Don't bring this intro live yet as it needs more work.

Location:
huginmunin/trunk/web/hm/app
Files:
44 added
13 modified

Legend:

Unmodified
Added
Removed

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

    r979 r985  
    4949} 
    5050 
    51 .large_button { 
    52         width: 11em; 
     51.intro_button { 
     52        padding: 1.3em; 
     53} 
     54 
     55.huge_button { 
     56        width: 14em; 
    5357        padding: .5em; 
    5458        z-index: 2; 
    5559} 
    5660 
     61.large_button { 
     62        width: 11.5em; 
     63        padding: .5em; 
     64        z-index: 2; 
     65} 
     66 
    5767.small_button { 
    58         width: 7.6em; 
     68        width: 8.5em; 
    5969        padding: .5em; 
    6070        z-index: 2; 
    … …  
    8494} 
    8595 
     96.small_intro_circle { 
     97        width: 8em; 
     98        padding: .5em; 
     99        z-index: 2; 
     100        float:left; 
     101        display: inline; 
     102}        
     103 
     104.intro_circle { 
     105        width: 14em; 
     106        padding: 1em; 
     107}        
     108 
    86109#Intro_flash_banner{ 
    87110        width: 670px; 
    88         height: 400px; 
     111        height: 280px; 
    89112        overflow: hidden; 
    90113        position: absolute; 
    … …  
    97120.intro_banner_spacer { 
    98121        width: 670px; 
    99         height: 170px; 
     122        height: 150px; 
    100123} 
    101124 

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

    r980 r985  
    1 html, body { background: #fff; } 
    2 html, body, th, td { 
    3   color: #777; 
    4   vertical-align: top; 
    5   text-align: left; 
    6   padding: 5px; 
    7   margin: 0px; 
    8   font:12px/1.4em Verdana,sans-serif; 
    9 } 
     1 
    102 
    113/************* divs ****************/ 
    124 
    13 h1 { text-align: center; } 
    145.title_interest { padding: .2em; background-color: #fffef9; border: medium double rgb(251,250,233);  margin: auto; overflow: auto;} 
    156 
    … …  
    4839.rating_choice {padding: 1.1em .58em 5.8em .58em; margin: auto; 
    4940        } 
    50 .float_links_box { 
    51         background-color: #3a3d69;  
    52         width:80%; height:2.2em;  
    53         margin: auto; 
    54         border: thin double rgb(239,168,166); 
    55         clear: both; 
    56         } 
    57  
    58 .float_links { 
    59         float: left; 
    60         width: 22%; 
    61         margin: -1em 0px -2em 0px; 
    62         text-align: center;      
    63         } 
    64 .float_links a:hover { text-decoration: underline; } 
    6541 
    6642 
    … …  
    7854 
    7955/* 
    80 li.center {text-align: center} 
    8156 
    8257ul.outside {list-style-position: outside} 
    … …  
    8661 
    8762/************* text/font ****************/ 
    88  
    89 h1 {line-height: 120%; padding: 1% 3%;} 
    9063 
    9164li {line-height: 130%} 

  • huginmunin/trunk/web/hm/app/templates/graph/list.html

    r979 r985  
    1010        <div class="expand_button control_button"> 
    1111                <span class="bubble_button small_button"> 
    12                                 <a><img class="small_button" alt="More Options" src="/Main/media/img/buttons/Options.png"></a> 
    13                                 <a><img class="small_button" alt="Click for Options" src="/Main/media/img/buttons/Options_Mouse_Over.png"></a> 
     12                                <a><img class="small_button" alt="More Options" src="/Main/media/img/buttons/Browse_Options.png"></a> 
     13                                <a><img class="small_button" alt="Click for Options" src="/Main/media/img/buttons/Browse_Options_Mouse_Over.png"></a> 
    1414                </span> 
    1515        </div> 

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

    r950 r985  
    77<div id="Intro_flash_banner"> 
    88        <embed 
    9        src='/Main/media/flash/Raj_animation.swf' 
     9       src='/Main/media/flash/tm_movie_111508.swf' 
    1010       type='application/x-shockwave-flash' 
    1111       wmode='transparent' 

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

    r963 r985  
    1313<div id="steptwo" class="howwork"> 
    1414<img src="/Main/media/img/steptwo.png" alt="rate other reviews" /> 
    15 <p>Based on your review, our community will rate a company's behavior <i>from 1-9.</i></p> 
     15<p>Anyone can use your review to <b>rate</b> a company's behavior on a scale <i>of 1-9.</i></p> 
    1616</div> 
    1717 
    1818<div id="stepthree" class="howwork"> 
    1919<img src="/Main/media/img/stepthree.png" alt="we have an algorithm to decide the final score" /> 
    20 <p>Reviews are combined based on your <b>portfolio of interests</b> to create product scores.</p> 
     20<p>Ratings are combined based on your <b>portfolio of interests</b> to create product scores.</p> 
    2121</div> 
    2222 

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

    r963 r985  
    77<div id="Intro_flash_banner"> 
    88        <embed 
    9        src='/Main/media/flash/Raj_animation.swf' 
     9       src='/Main/media/flash/tm_movie_111508.swf' 
    1010       type='application/x-shockwave-flash' 
    1111       wmode='transparent' 

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

    r950 r985  
    77<div id="Intro_flash_banner"> 
    88        <embed 
    9        src='/Main/media/flash/Raj_animation.swf' 
     9       src='/Main/media/flash/tm_movie_111508.swf' 
    1010       type='application/x-shockwave-flash' 
    1111       wmode='transparent' 

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

    r963 r985  
    55<div id="Intro_flash_banner"> 
    66        <embed 
    7        src='/Main/media/flash/Raj_animation.swf' 
     7       src='/Main/media/flash/tm_movie_111508.swf' 
    88       type='application/x-shockwave-flash' 
    99       wmode='transparent' 

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

    r963 r985  
    2525         
    2626<div> 
    27                 <a href="/blog/about">  
    28                         <img src="/Main/media/img/RajDiagramHorizontal.png"  class="intro_image" alt="Visit our blog to find out more." /> 
    29                 </a> 
    30         </div> 
     27        <a href="/blog/about">  
     28                <img src="/Main/media/img/RajDiagramHorizontal.png"  class="intro_image" alt="Visit our blog to find out more." /> 
     29        </a> 
     30</div> 
    3131                 
    3232{% endblock %} 

  • huginmunin/trunk/web/hm/app/templates/left_menu.html

    r963 r985  
    22<div class="menu_overall"> 
    33        <ul> 
    4                 <li> <a href="{% url coming_soon %}">Quickrate</A> <span class="coming_soon">(coming soon)</span></li> 
     4                <li> <a href="{% url quickrate %}">Quick Rate</A></li> 
    55                <li> <A HREF="{% url browse %}">Browse</A></li> 
    66                <li> <a href="{% url coming_soon %}">Projects</A> <span class="coming_soon">(coming soon)</span></li> 
    77                {% if user.is_authenticated %}<li> <A HREF="{% url profile user.id %}"> My Stuff</A> </li>{% endif %}  
    88                <li> <a href="{% url coming_soon %}">Community</A> <span class="coming_soon">(coming soon)</span></li> 
    9                 <li> <a href="{% url coming_soon %}">Help</a> <span class="coming_soon">(coming soon)</span></li> 
     9                <li> <a href="{% url intro "intro_paths" %}">Intro</a></li> 
    1010        </ul> 
    1111</div> 

  • huginmunin/trunk/web/hm/app/templates/quickrate/quickrate_extension.html

    r980 r985  
     1{% extends "general_extension.html" %} 
     2 
     3{# --------------------------------------------------------And is extended by browse_list.html and other browse templates------------- #} 
     4{# --------------------------------------------------------This page defines layouts specific to specific templates---- #} 
     5 
     6{# -------------------------------------------------Items for left collumn in general_extension.html------------- #} 
     7 
     8{# --------------------------------------------------------------Items for middle column below------------- #} 
     9 
     10{% block content_general_center %} 
    111 
    212<link rel="stylesheet" type="text/css" href="/Main/media/css/quickrate.css"></link> 
    313<script type="text/javascript" charset="utf-8" src="/Main/media/js/jquery.min.js"></script> 
    414 
    5 <div class="floatright"> 
    6         <a href="http://bilumi.org/">  
    7                 <img border="0" src="http://bilumi.org/blog/wp-content/uploads/upcLogo.png" width="242" alt=""> 
    8         </a> 
    9 </div> 
    10  
    11 <div id="quickrate_content"> 
    12  
    1315<h1> 
    1416        {% block title %}{% endblock %} 
    1517</h1> 
     18 
     19{% block top_box_title %}{% endblock %} 
    1620 
    1721<div class="review"> 
    … …  
    2630{% endblock %} 
    2731 
    28 <h3 class="float_left">REVIEW ACTIONS</h3> 
    29 <div class="float_links_box"> 
    30         <div class="float_links"> 
    31                 <a href="{% url coming_soon %}"><h2 class="purple">Respond <small style="font-size:.65em;">(coming soon)</small></h2></a> 
    32         </div> 
    33         <div class="float_links"> 
    34                 <a href="{% url flag review.id %}"><h2 class="red">Flag</h2></a> 
    35         </div> 
    36         <div class="float_links"> 
    37                 <a href="{% url quickrate %}"><h2 class="light_green">Skip</h2></a> 
    38         </div> 
     32{% block big_box %}{% endblock %} 
    3933 
    40         <div class="float_links">        
    41                 <a href="http://bilumi.org/"> 
    42                         <img border=0 src="http://www.bilumi.org/blog/wp-content/uploads/RavensIconFlat.gif" alt="" width="100%" class="bottom_icon"> 
    43                 </a> 
    44         </div> 
     34{% endblock %} 
     35 
     36 
     37{# --------------------------------------------------------------Items for right column below------------- #} 
     38 
     39 
     40{% block rightmenu %} 
     41<div class="menu_border"> 
     42<div class="menu_overall"> 
     43        <ul> 
     44                <li> <a href="{% url coming_soon %}">Respond <small style="font-size:.65em;">(coming soon)</small></a> 
     45        </li> 
     46                <li> <a href="{% url flag review.id %}">Flag</a></li> 
     47                <li>            <a href="{% url quickrate %}">Skip</a></li> 
     48                <li> <a href="http://bilumi.org/"> 
     49                                <img border=0 src="http://www.bilumi.org/blog/wp-content/uploads/RavensIconFlat.gif" alt="" width="100%" class="bottom_icon"> 
     50                        </a></li> 
     51        </ul> 
    4552</div> 
     53</div> 
     54{% endblock %} 
     55 

  • huginmunin/trunk/web/hm/app/templates/quickrate/rate_review.html

    r980 r985  
    22 
    33{% block title %} 
    4         Rate <a href="{% url node review.node.id %}">{{ review.node.label }}</a> on  
    5         <span class="title_interest">{{ review.dimension.label }} <small><a href="{% url select_interest review.id %}"> (change)</a></small></span> 
    6         based on this review 
     4        Rate the 
     5        <span class="title_interest">{{ review.dimension.label }}<small><a href="{% url select_interest review.id %}"> (change)</a></small></span> 
     6        practices of 
     7        <a href="{% url node review.node.id %}">{{ review.node.label }}</a> 
     8        based on this review: 
    79{% endblock %} 
    810 

  • huginmunin/trunk/web/hm/app/views/main.py

    r982 r985  
    212212#     {% url "intro" part="values" %} 
    213213INTRO_PART_TO_TEMPLATE = { 
    214         'values': 'intro/intro_values.html', 
    215         'what_is': 'intro/intro_what_is.html', 
    216         'how_work': 'intro/intro_how_work.html', 
    217         'video': 'intro/intro_video.html', 
    218         'recent': 'intro/intro_recent.html', 
    219         'announcements': 'intro/intro_announcements.html', 
    220         'choices': 'intro/intro_choices.html', 
     214        'values': 'intro_values.html', 
     215        'what_is': 'intro_what_is.html', 
     216        'how_work': 'intro_how_work.html', 
     217        'video': 'intro_video.html', 
     218        'recent': 'intro_recent.html', 
     219        'announcements': 'intro_announcements.html', 
     220        'choices': 'intro_choices.html', 
    221221                                              
    222         'intro_parts': 'intro_paths.html', 
     222        'intro_paths': 'intro_paths.html', 
    223223         
    224224        'share_1': 'share_1.html', 
    … …  
    260260                             'category':category,} # returns none because doesn't get category tag (only get 0.9 and 1.0 rss) 
    261261                items.append(item_data) 
    262         return render_response(request, INTRO_PART_TO_TEMPLATE[part], locals()) 
     262        return render_response(request, 'intro/%s'%INTRO_PART_TO_TEMPLATE[part], locals()) 
    263263 
    264264ADMIN_MODELS = {'NodeType':'NodeType', 'EdgeType':'EdgeType', 'Interest':'Dimension',