Merge pull request #1 from wc351/master

Update1
Merge pull request #2 from wc351/master

Merge from master
Initial commit of bootstrap implementation.
Merge branch 'master' of https://github.com/clsmit8703/ungmap into bs_fb
Working on the HTML/CSS for Main Page

I went to Layoutit!'s Website and downloaded a bootstrap code for the Navbar and the Carousel.  I customized the navbar some more by deleting fields we didn't need (like more buttons) and took out the search from the top.  On the Carousel,  I added some text that made sense.  My next step for that is to find better photos to display.  Third,  I found some code for a search bar.  I put it below the Carousel so people can scroll down and type in what they are looking for.  My next step is to customize it some more by changing the color of the nav bar, adding better photos, and perhaps making the Search Bar bigger.
Took out keys
Updated the models file and files associated with the models.

Updated the models and removed some of the redundant models for the project.

Registered the models in the admin.py file so that they can be accessed through the admin on the website.

 Created a static folder that is currently empty that can be used at a later time.

 Removed the keys from the settings.py file.
Merge pull request #4 from wc351/models_fb

Updated the models.py file and associated files.
Updated bootstrap on the main page.

I took the nav bar out of the main_page.html and added it to the base.html.  I also added a navbar.css file to overrride the bootstrap; this made the nav bar be navy blue with yellow hover text.

I then had to make a static folder to hole the css files.  While there, I added some blank colored images (blue, pink, green, and orange all 1600x500px) to use a placeholders in the carousel.  I want to eventually take these out and add photos of the school.  These will do for now.

I also adjusted the colors of the search button to match the nav bars.  I also added radio buttons so that the user can choose either building, professor, or parking lots.
Added more html pages

I set the nav-bar up so that all of the tabs will lead you to the correct page.
IE: About Us, Browse Directories, and Campuses (all four campuses).

I set up the URLS, the views, and the templates.  The templates are very plain-- it extends the base that has the nav bar, and each page has what will be going on that page.
Merge pull request #5 from clsmit8703/development

Development 1.0
Updated the models file and files associated with the models.

Updated the Buildings model to better reflect the data that will be loaded into the webpage.
Merge pull request #6 from wc351/models_fb

Updated the models file and files associated with the models.
Altered Models and set up initial datafixture

Alterations to models included all of the following: Altered all models that contained geom = multipolygon to a geometry field. After printing the data for each shapefile, the polygons were labeled as polygon or multipolygon. Removed from pics model pic_campus. Each image will be linked to a building; building has a campus field. Altered geom in campus model to a point field instead of polygon field. At this time, the point is set to a center point of each campus. Altered character field length in several models. The fields were not long enough to hold the fixture data. Also changed field num to build_num. Arcmap will not allow a num field name.
Altered Models and set up initial datafixture

Alterations to models included all of the following: Altered all models that contained geom = multipolygon to a geometry field. After printing the data for each shapefile, the polygons were labeled as polygon or multipolygon. Removed from pics model pic_campus. Each image will be linked to a building; building has a campus field. Altered geom in campus model to a point field instead of polygon field. At this time, the point is set to a center point of each campus. Altered character field length in several models. The fields were not long enough to hold the fixture data. Also changed field num to build_num. Arcmap will not allow a num field name.
Merge pull request #9 from crlyli/datafixture_fb

Datafixture fb
Set up API and altered urls

Created new a new url file for the api as well as a serializer file and json views. Files were required to set up url. Added the new url file to the main urls. Also altered the project urls to include a namespace for referencing purposes.
Merge pull request #10 from crlyli/development

Set up API and altered urls
Implemented django haystack using whoosh backend

Altered settings.py to include haystack connections to whoosh backend. Also added haystack to installed apps. Created search_indexes.py. File is required to use haystack. Added text files for each model to be searched. Objects in each file are what will be searched in the models. Added search template using basic template provided by the tutorial. Updated main urls to include haystack urls. Altered str in models to clean up data show when search is preformed. Altered base.html to include search in navigation bar and link to search page. Added django haystack and whoosh to the requirements.txt.
Writing Test

Created test for main url and api urls as well as test for models. Still need to look at how to run tests correctly.