← Back to team overview

team4alfanous team mailing list archive

[Branch ~team4alfanous/alfanous/alfanous-git] Rev 406: -Changed the setting.py paths to make it more dynamic.

 

------------------------------------------------------------
revno: 406
committer: Suhail Alkowaileet <xsoh.k7@xxxxxxxxx>
timestamp: Sat 2012-10-27 00:26:34 +0300
message:
  -Changed the setting.py paths to make it more dynamic.
  -Fixed issue #101 (need to check).
modified:
  src/alfanous-django/settings.py
  src/alfanous-django/templates/base.html


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription
=== modified file 'src/alfanous-django/settings.py'
--- src/alfanous-django/settings.py	2012-08-08 23:11:59 +0000
+++ src/alfanous-django/settings.py	2012-10-26 21:26:34 +0000
@@ -48,7 +48,7 @@
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = '/QSE/root/alfanous_git/alfanous-code/src/alfanous-django/media/'
+MEDIA_ROOT = './media/'
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
@@ -75,7 +75,7 @@
     # 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.
-'/QSE/root/alfanous_git/alfanous-code/src/alfanous-django/wui/static',
+'./wui/static',
 )
 
 # List of finder classes that know how to find static files in
@@ -110,7 +110,7 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '/QSE/root/alfanous_git/alfanous-code/src/alfanous-django/templates/',
+    './templates/',
 )
 
 INSTALLED_APPS = (
@@ -152,8 +152,8 @@
 
 
 LOCALE_PATHS = (
-    '/QSE/root/alfanous_git/alfanous-code/src/alfanous-django/locale',
-'/QSE/root/alfanous_git/alfanous-code/src/alfanous-django/wui/locale',
+    './locale',
+'./wui/locale',
     
 )
 

=== modified file 'src/alfanous-django/templates/base.html'
--- src/alfanous-django/templates/base.html	2012-08-08 23:11:59 +0000
+++ src/alfanous-django/templates/base.html	2012-10-26 21:26:34 +0000
@@ -275,7 +275,7 @@
 						results += "] <br></span></p><br />";
 						
 					results += "<p dir='ltr' align='center' style=' margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>";
-						results += "<span style='font-family: \"Droid Sans\", Tahoma, \"Bitstream Vera Sans\", \"DejaVu Sans\", Verdana, Geneva, Arial, Sans-serif; line-height: 150%;'>"+ json.ayas[i].aya.traduction+ "</span></p>";
+					if(json.ayas[i].aya.traduction) results += "<span style='font-family: \"Droid Sans\", Tahoma, \"Bitstream Vera Sans\", \"DejaVu Sans\", Verdana, Geneva, Arial, Sans-serif; line-height: 150%;'>"+ json.ayas[i].aya.traduction+ "</span></p>";
 					results += "<br><p align='center' style=' margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>";
 						
 						results += "<span style=' color:#808080;'>"