Merge pull request #16 from mattsenate/master
FF AdBlocker Bug Fix and README Update
This commit is contained in:
		
						commit
						a8e33f14ea
					
				
					 5 changed files with 22 additions and 5 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,3 +1,4 @@
 | 
				
			||||||
_build
 | 
					_build
 | 
				
			||||||
*.pyc
 | 
					*.pyc
 | 
				
			||||||
dev.db
 | 
					dev.db
 | 
				
			||||||
 | 
					site_media
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										20
									
								
								README
									
										
									
									
									
								
							
							
						
						
									
										20
									
								
								README
									
										
									
									
									
								
							| 
						 | 
					@ -1,6 +1,22 @@
 | 
				
			||||||
Symposion
 | 
					#Symposion#
 | 
				
			||||||
a conference management solution from Eldarion
 | 
					
 | 
				
			||||||
 | 
					A conference management solution from Eldarion.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Built with the generous support of the Python Software Foundation.
 | 
					Built with the generous support of the Python Software Foundation.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
See http://eldarion.com/symposion/ for commercial support, customization and hosting
 | 
					See http://eldarion.com/symposion/ for commercial support, customization and hosting
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					##Instructions##
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						git clone https://github.com/OAhack/symposion.git
 | 
				
			||||||
 | 
						virtualenv env
 | 
				
			||||||
 | 
						source env/bin/activate
 | 
				
			||||||
 | 
						pip install -r requirements.txt
 | 
				
			||||||
 | 
						python manage.py syncdb
 | 
				
			||||||
 | 
					 	python manage.py runserver
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					###Load Default (Fixture) Data###
 | 
				
			||||||
 | 
						python manage.py loaddata
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					The site won't work until you create an entry for 'conference' in admin panel available at /admin/ (admin login is email, password.  Not user, password). 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block head_title %}{% trans "Add a Sponsor" %}{% endblock %}
 | 
					{% block head_title %}{% trans "Add a Sponsor" %}{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block body_class %}sponsors{% endblock %}
 | 
					{% block body_class %}sponsorships{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block body %}
 | 
					{% block body %}
 | 
				
			||||||
    <form method="POST" action="{% url sponsor_add %}" class="form-horizontal">
 | 
					    <form method="POST" action="{% url sponsor_add %}" class="form-horizontal">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block head_title %}{% trans "Apply to be a Sponsor" %}{% endblock %}
 | 
					{% block head_title %}{% trans "Apply to be a Sponsor" %}{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block body_class %}sponsors{% endblock %}
 | 
					{% block body_class %}sponsorships{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block body %}
 | 
					{% block body %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block head_title %}{% trans "About Our Sponsors" %}{% endblock %}
 | 
					{% block head_title %}{% trans "About Our Sponsors" %}{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block body_class %}sponsors{% endblock %}
 | 
					{% block body_class %}sponsorships{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block body_outer %}
 | 
					{% block body_outer %}
 | 
				
			||||||
    <div class="row">
 | 
					    <div class="row">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue