Changeset 74a669d

Timestamp:

04/02/12 11:13:54 (14 months 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:

• example/sandbox_sqlite/settings.py (modified) (2 diffs)
• telemeta/htdocs/css/telemeta.css (modified) (13 diffs)
• telemeta/templates/telemeta/mediaitem_player_simple.html (added)
• telemeta/urls.py (modified) (1 diff)
• telemeta/templates/telemeta/base.html (modified) (1 diff)

example/sandbox_sqlite/settings.py

@@ -62 +62 @@
 MEDIA_URL = '/media/'
 
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = 'http://localhost/django/media/'
+# Absolute path to the directory static files should be collected to.
+# Don't put anything in this directory yourself; store your static files
+# in apps' "static/" subdirectories and in STATICFILES_DIRS.
+# Example: "/home/media/media.lawrence.com/static/"
+STATIC_ROOT = '/data/telemeta/static/'
 
+# URL prefix for static files.
+# Example: "http://media.lawrence.com/static/"
+STATIC_URL = '/static/'
+
+# Additional locations of static files
+STATICFILES_DIRS = (
+# Put strings here, like "/home/html/static" or "C:/www/django/static".
+# Always use forward slashes, even on Windows.
+# Don't forget to use absolute paths, not relative paths.
+)
+
+# List of finder classes that know how to find static files in
+# various locations.
+STATICFILES_FINDERS = (
+'django.contrib.staticfiles.finders.FileSystemFinder',
+'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+)
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'a8l7%06wr2k+3=%#*#@#rvop2mmzko)44%7k(zx%lls^ihm9^5'
@@ -106 +125 @@
     'django.contrib.messages',
     'django.contrib.admin',
+    'django.contrib.staticfiles',
     'django_extensions',
     'telemeta',

telemeta/htdocs/css/telemeta.css

@@ -88 +88 @@
     font-weight: bold;
     display:  inline;
-    font-size: 120%; 
+    font-size: 120%;
 }
 #content h3 {
@@ -168 +168 @@
 
 #collection_player {
-    background: transparent; 
+    background: transparent;
     /*     background-image: url(../images/grid_bg.png); */
 }
 
 #collection_player .title {
-    padding: 2px 5px 7px 5px; 
+    padding: 2px 5px 7px 5px;
 }
 
@@ -208 +208 @@
     width: 100%;
 }
-    
+
 
 .analyzer-title {
@@ -477 +477 @@
 
 /* Drop Down Menus */
-.clear {clear:both} 
+.clear {clear:both}
 
 #nav {
@@ -483 +483 @@
     padding:0;
     list-style:none;
-}  
+}
 
 /* make the LI display inline */
@@ -490 +490 @@
 
 #nav li {
-display:inline-block; 
+display:inline-block;
 position:relative;
 z-index:500;
 }
-    
+
 /* this is the parent menu */
 #nav li a {
@@ -520 +520 @@
     color: #FFF;
 }
-    
+
 #nav ul li {
     width:100px;
@@ -526 +526 @@
     border-bottom:0px solid #fff;
 }
-    
+
 /* display block will make the link fill the whole area of LI */
 #nav ul a {
-    display:block; 
+    display:block;
     height:15px;
     padding: 5px 5px;
@@ -542 +542 @@
     border-bottom-width: 0px;
 }
-    
+
 #nav ul a:hover {
     background-color: #FFF ;
@@ -852 +852 @@
 
 table td.error {
-    color: red; 
+    color: red;
     font-weight: bold;
 }
 
 .infos li.error{
-    color: red; 
+    color: red;
     font-weight: bold;
     font-size: 110%;
@@ -919 +919 @@
     color: #FFF;
     font-size: 1.1em;
-    font-weight: bold; 
+    font-weight: bold;
 }
 
@@ -1077 +1077 @@
     background-image: url('../images/ok.png');
 }
-.markerdiv{ 
+.markerdiv{
     border: 1px solid #aaaaaa;
     margin-bottom: 1ex;
@@ -1138 +1138 @@
 
 .icon_edit{
-    background-image: url('../images/edit_page.png'); 
+    background-image: url('../images/edit_page.png');
 }
 .icon_copy{

telemeta/urls.py

@@ -113 +113 @@
     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,
         dict(template='telemeta/mediaitem_player.html'), name="telemeta-item-player"),
+    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,
+        dict(template='telemeta/mediaitem_player_simple.html'), name="telemeta-item-player-simple"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/performances/$', item_view.item_performances_edit,
         dict(template='telemeta/mediaitem_performances_edit.html'), name="telemeta-item-performances_edit"),

telemeta/templates/telemeta/base.html

@@ -64 +64 @@
 <img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a>
 {% else %}
+<div style="float: left;">
 <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
+</div>
+<div style="float: right;;">
+{% load facebook %}
+{% facebook_button %}
+</div>
 {% endif %}
 </div>