Add temp files '*~' to .gitignore
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add browse-locations page

The interface for browsing locations is available at
/xtf/search?browse-locations=yes . Only the subset of documents
with geographic metadata is returned, and the sidebar facets
allow drilling down further within that subset.
Add changes to the default queryParser

The queryParser was previously assumed unchanged in git. However,
because of the need to browse the subset of documents with
locations, queryParser has been added to this commit.

Also, the additional index-* folders have been removed.
Reduce duplication in the two main Browse pages

The templates handling Browse All and Browse Locations each now
redirect the XSL processor to a template named "skeleton-template."
This new template keeps the basic HTML in one place, modifying
only the handful of lines which differ between Browse All and
Browse Locations.
Generate map markers, rectangles, and popups from search results

For the set of Browse Locations results, each geoLocationPoint is
turned into a map Marker, each geoLocationBox is turned into a
rectangle, and each map layer is given a popup box with information
from its associated metadata record.
Add links and buttons to the geographic interface

The Dash front page and the Browse All page both now have buttons
which are linked to the Browse Locations page. The records' pages
also have buttons if they have geographic metadata - eventually
these will link to a map with record-specific geoLocations. For
now the button links to the Browse Locations page too.
Add record-specific locations interface and fix nested rectangles

The button on the records page now points to a URL which includes
the docId as well as "browse-locations=yes". This interface is a
cross between the records page and the standard browse page. Only
the locations associated with the record at docId are shown on the
map.

JS now checks to make sure that rectangles do not hide other
rectangles. If rectangle A is found to contain rectangle B, then
A is moved to a layer below B.
Set up Orange County Data Portal page

The "browse-orangecounty" page mirrors "browse-locations" in its
basic functionality and HTML structure. It retrieves only those
pages indexed with the browse-orangecounty element and a "yes"
value. Because the CSS for browse-all and -locations is linked to
ID attributes, the new page does not have similar aesthetics.
Style OC Data Portal results

The OC Data Portal is structured similarly to Browse Locations and
Browse All, but has a different color scheme. The Browse-* pages
are now styled upon matching the browse-page and browse-container
classes, instead of their ID attributes. The ID attributes are
retained in case other JS or CSS rules apply.
Set up OCDP-specific Home and About pages

The navigation bar link to the OC Data Portal now leads to a home
page similar to that for Dash itself. Within the OCDP, searches
and links to About pages take users to OCDP-specific resources.
All OCDC-specific pages share CSS styling.

Searches within the general geographic interface now also return
results within that interface, as do the metadata links within the
result listings.
Merge remote-tracking branch 'upstream/master' into browse-orangecounty

Resolved conflicts in:
	xtf/assets/assets.xml
	xtf/style/crossQuery/resultFormatter/common/resultFormatterCommon.xsl
	xtf/style/crossQuery/resultFormatter/default/resultFormatter.xsl
	xtf/style/textIndexer/common/preFilterCommon.xsl
Merge pull request #9 from amclark42/browse-orangecounty

Browse orangecounty