magicrebirth avatar magicrebirth committed d65cf83

simplified LOCAL_SERVER, LIVE_SERVER routine in settings.py

Comments (0)

Files changed (5)

demoproject/apps/djfacet/templates/djfacet/components/control_bar.html

 		                                   
 			
 		{% endif  %}
-			
+
+
+	    </ul>       
+	</div><!-- result type ends -->
+	
+	
+	
+	{# PREVIOUS VERSION #}
+				
 				
 		{# {% if not djfacet_splashpage %} #}
 		{# {% if djfacet_singlefacet %} #}
 
 
         
-    </ul>       
-</div><!-- result type ends -->

demoproject/local_settings.py

 	    'ENGINE': 'django.db.backends.mysql',
 		'USER': 'root',
 		# 'DATABASE_PORT' : '3306',
-		'PASSWORD' : 'bea' , 
+		'PASSWORD' : 'mikele' ,    # mikele or bea
 		'HOST' : '127.0.0.1',
     }
 }
 
 
 
+
+
 # Make this unique and don't share it with anybody
 SECRET_KEY = '*j%v!8#km*h#^llq58b_8!4w)5v42d%_h(9%ff72lc0r=_b)!w'
 

demoproject/settings.py

 sys.path.append(os.path.join(SITE_ROOT, "demoproject/libs"))
 
 
-MYLOCAL_SERVER_PATH = "/djangostack-1.3.1-3/apps/django/"
+# handy variable for setting up other parameters
+LOCAL_SERVER, LIVE_SERVER = True, False
 
-# DYNAMIC LOCATION SELECTION: MODIFY AS NEEDED!
-if MYLOCAL_SERVER_PATH in SITE_ROOT: 
-	LOCAL_SERVER, LIVE_SERVER = True, False
-else:
-	LOCAL_SERVER, LIVE_SERVER = False, True
-if not (LOCAL_SERVER or LIVE_SERVER):
-	raise Exception("Could not determine which location you're in! \nLOCAL_SERVER or LIVE_SERVER?")
-	
 
 if not LIVE_SERVER:
 	DEBUG = True

demoproject/static/djfacet_beax/css/site.css

 .activeResType {text-transform: uppercase;}
 #historyPanel {margin-top: 30px;}
 #historyPanel h3 {padding-left: 20px;}
-#historyPanel .filtersList { background: #C4C4C2; border: 2px solid #9E9E9E; box-shadow: none; border-radius: 0; }
+#historyPanel .filtersList { background: white; border: 2px solid #9E9E9E; box-shadow: none; border-radius: 0; }
 #historyPanel a {text-decoration: none; border-bottom: 1px dotted #536383; color:#536383;}
 #historyPanel a:hover {color: #233353; border-bottom: 1px solid #233353;}
 
 Import that into the database associated to your Django installation. 
 
 
-UPDATING SETTINGS.PY:
-............
-Where it says: MYLOCAL_SERVER_PATH = "/mac/Dropbox/code/"
-==> modify it with something that matches your local installation..
-
-
 UPDATING LOCAL_SETTINGS.PY:
 ..................
 Update the DATABASES dictionary so that the demo database can be accessed. 
 
 
+RUN THE APPLICATION
+...........................................................
 That's it.. now you should be able to run the app as usual:
-...........................................................
 python manage.py runserver 
 
-To access the admin login as: usr: test / psw: test 
-(you'll have administrator rights)
+To access the admin login as (administrator account): 
+usr: test / psw: test 
 
-DJFacet is mounted on http://127.0.0.1:8000/djfacet/
+DJFacet is mounted on:
+http://127.0.0.1:8000/djfacet/
 
 
 
 
 2012-05-29
 -----------------------------------------
+* simplified LOCAL_SERVER, LIVE_SERVER routine in settings.py
+* updated CSS (added open-close icons, help icons)
+* updated js for openclose behaviour
 * facetedbrowser.html: removed controls_selected 
 * control-bar.html: updated the way selected facet values are presented
 * single-facet: updated breadcrumbds rendering
 
 
+
 2012-05-23
 -----------------------------------------
 * fixed bug that prevented mptt hierarchy navigation when using cached values
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.