Changeset 74a669d


Ignore:
Timestamp:
04/02/12 11:13:54 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
social
Children:
d928813
Parents:
ddaaf4c (diff), 47b7698 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (04/02/12 11:13:54)
git-committer:
yomguy <yomguy@…> (04/02/12 11:13:54)
Message:

Merge branch 'master' into social

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • example/sandbox_sqlite/settings.py

    rda3dd5d r74a669d  
    6262MEDIA_URL = '/media/' 
    6363 
    64 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a 
    65 # trailing slash. 
    66 # Examples: "http://foo.com/media/", "/media/". 
    67 ADMIN_MEDIA_PREFIX = 'http://localhost/django/media/' 
     64# Absolute path to the directory static files should be collected to. 
     65# Don't put anything in this directory yourself; store your static files 
     66# in apps' "static/" subdirectories and in STATICFILES_DIRS. 
     67# Example: "/home/media/media.lawrence.com/static/" 
     68STATIC_ROOT = '/data/telemeta/static/' 
    6869 
     70# URL prefix for static files. 
     71# Example: "http://media.lawrence.com/static/" 
     72STATIC_URL = '/static/' 
     73 
     74# Additional locations of static files 
     75STATICFILES_DIRS = ( 
     76# Put strings here, like "/home/html/static" or "C:/www/django/static". 
     77# Always use forward slashes, even on Windows. 
     78# Don't forget to use absolute paths, not relative paths. 
     79) 
     80 
     81# List of finder classes that know how to find static files in 
     82# various locations. 
     83STATICFILES_FINDERS = ( 
     84'django.contrib.staticfiles.finders.FileSystemFinder', 
     85'django.contrib.staticfiles.finders.AppDirectoriesFinder', 
     86#    'django.contrib.staticfiles.finders.DefaultStorageFinder', 
     87) 
    6988# Make this unique, and don't share it with anybody. 
    7089SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#rvop2mmzko)44%7k(zx%lls^ihm9^5' 
     
    106125    'django.contrib.messages', 
    107126    'django.contrib.admin', 
     127    'django.contrib.staticfiles', 
    108128    'django_extensions', 
    109129    'telemeta', 
  • telemeta/htdocs/css/telemeta.css

    r8a5b1b5 r47b7698  
    8888    font-weight: bold; 
    8989    display:  inline; 
    90     font-size: 120%;  
     90    font-size: 120%; 
    9191} 
    9292#content h3 { 
     
    168168 
    169169#collection_player { 
    170     background: transparent;  
     170    background: transparent; 
    171171    /*     background-image: url(../images/grid_bg.png); */ 
    172172} 
    173173 
    174174#collection_player .title { 
    175     padding: 2px 5px 7px 5px;  
     175    padding: 2px 5px 7px 5px; 
    176176} 
    177177 
     
    208208    width: 100%; 
    209209} 
    210      
     210 
    211211 
    212212.analyzer-title { 
     
    477477 
    478478/* Drop Down Menus */ 
    479 .clear {clear:both}  
     479.clear {clear:both} 
    480480 
    481481#nav { 
     
    483483    padding:0; 
    484484    list-style:none; 
    485 }   
     485} 
    486486 
    487487/* make the LI display inline */ 
     
    490490 
    491491#nav li { 
    492 display:inline-block;  
     492display:inline-block; 
    493493position:relative; 
    494494z-index:500; 
    495495} 
    496      
     496 
    497497/* this is the parent menu */ 
    498498#nav li a { 
     
    520520    color: #FFF; 
    521521} 
    522      
     522 
    523523#nav ul li { 
    524524    width:100px; 
     
    526526    border-bottom:0px solid #fff; 
    527527} 
    528      
     528 
    529529/* display block will make the link fill the whole area of LI */ 
    530530#nav ul a { 
    531     display:block;  
     531    display:block; 
    532532    height:15px; 
    533533    padding: 5px 5px; 
     
    542542    border-bottom-width: 0px; 
    543543} 
    544      
     544 
    545545#nav ul a:hover { 
    546546    background-color: #FFF ; 
     
    852852 
    853853table td.error { 
    854     color: red;  
     854    color: red; 
    855855    font-weight: bold; 
    856856} 
    857857 
    858858.infos li.error{ 
    859     color: red;  
     859    color: red; 
    860860    font-weight: bold; 
    861861    font-size: 110%; 
     
    919919    color: #FFF; 
    920920    font-size: 1.1em; 
    921     font-weight: bold;  
     921    font-weight: bold; 
    922922} 
    923923 
     
    10771077    background-image: url('../images/ok.png'); 
    10781078} 
    1079 .markerdiv{  
     1079.markerdiv{ 
    10801080    border: 1px solid #aaaaaa; 
    10811081    margin-bottom: 1ex; 
     
    11381138 
    11391139.icon_edit{ 
    1140     background-image: url('../images/edit_page.png');  
     1140    background-image: url('../images/edit_page.png'); 
    11411141} 
    11421142.icon_copy{ 
  • telemeta/urls.py

    r8a5b1b5 r47b7698  
    113113    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/$', item_view.item_detail, 
    114114        dict(template='telemeta/mediaitem_player.html'), name="telemeta-item-player"), 
     115    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/simple/$', item_view.item_detail, 
     116        dict(template='telemeta/mediaitem_player_simple.html'), name="telemeta-item-player-simple"), 
    115117    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/performances/$', item_view.item_performances_edit, 
    116118        dict(template='telemeta/mediaitem_performances_edit.html'), name="telemeta-item-performances_edit"), 
  • telemeta/templates/telemeta/base.html

    r8a5b1b5 rddaaf4c  
    6464<img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a> 
    6565{% else %} 
     66<div style="float: left;"> 
    6667<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
    6768<a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a> 
     69</div> 
     70<div style="float: right;;"> 
     71{% load facebook %} 
     72{% facebook_button %} 
     73</div> 
    6874{% endif %} 
    6975</div> 
Note: See TracChangeset for help on using the changeset viewer.