Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
olmo committed Oct 3, 2011
1 parent 50ce7fd commit 8b83b12
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 155 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*.pyc
.idea/*
settings.py
db.sqlite
site_media/archivos/*
16 changes: 9 additions & 7 deletions settings.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Django settings for plataforma project.

import os

DEBUG = True
TEMPLATE_DEBUG = DEBUG

PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))

ADMINS = (
# ('Your Name', '[email protected]'),
)
Expand All @@ -12,7 +16,7 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
'NAME': 'C:\Users\Olmo\Documents\Proyectos\plataforma\db.sqlite', # Or path to database file if using sqlite3.
'NAME': 'db.sqlite', # Or path to database file if using sqlite3.
'USER': '', # Not used with sqlite3.
'PASSWORD': '', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
Expand Down Expand Up @@ -45,12 +49,12 @@

# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = 'C:\Users\Olmo\Documents\Proyectos\plataforma\site_media'
MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'site_media')

# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash.
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
MEDIA_URL = 'http://localhost:8000/site_media/'
MEDIA_URL = '/site_media/'

# Absolute path to the directory static files should be collected to.
# Don't put anything in this directory yourself; store your static files
Expand All @@ -69,9 +73,7 @@

# 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.
os.path.join(PROJECT_ROOT, 'static')
)

# List of finder classes that know how to find static files in
Expand Down Expand Up @@ -103,7 +105,7 @@
ROOT_URLCONF = 'plataforma.urls'

TEMPLATE_DIRS = (
'c:/Users/Olmo/Documents/Proyectos/plataforma/templates',
os.path.join(PROJECT_ROOT, 'templates'),
)

INSTALLED_APPS = (
Expand Down
146 changes: 0 additions & 146 deletions settings.py_general

This file was deleted.

Binary file added site_media/imagenes/download.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added site_media/imagenes/warning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion site_media/js/examenes.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ $(document).ready(function(){
resultHtml+='<tr><td>'+item.anno+'</td>';
resultHtml+='<td>'+item.convocatoria+'</td>';
resultHtml+='<td>'+item.solucion+'</td>';
resultHtml+='<td><a href="'+item.archivo+'">'+item.archivo+'</a></td>';
resultHtml+='<td><a href="'+item.archivo+'"><img src="/site_media/imagenes/download.png" height="25px"/></a><a href="'+item.id+'"><img src="/site_media/imagenes/warning.png" height="25px"/></a></td>';
resultHtml+='</tr>';
});
resultHtml+='</tbody></table>';
Expand Down

0 comments on commit 8b83b12

Please sign in to comment.