Ignore .DS_Store files
Make admin.js a template

Make admin.js a template, so that we can interpolate the value of
the ADMIN_PUBLIC_URL parameter, to make the AJAX call for getting
the default email text to be sent to a user when their request is
to be hidden work correctly even when the admin site is served
through a secure proxy (as it is at mySociety).

Also remove some residual example code that presumably persists from
the demo theme this theme was derived from.
Fix routing patch

The routing patch code in the example theme doesn’t work. This does.
Fix ERB tag syntax in the source
Allow subject to be specified when request hidden

When a request is hidden by an admin user, allow them to choose
the subject line of the email that is sent to the requester.

Relies on commit b558fe5 to alaveteli.
Don’t override categories.

The admin theme should NOT override the list of public body categories
that is defined in the site-specific theme!
Remove stub views

Some stub views from the example theme accidentally made their
way into this one.
Indentation(!)

It is not right to treat structural indentation with such contempt.
Consistent indentation is all that stands between us and the unfathomable
chaos of the fiery deep.
Correct the data-parent references

Correct the data-parent references used for the Bootstrap accordion
mechanism. This is principally to fix the following bug reported
by Alex Skene:

> 5) https://secure.mysociety.org/admin/foi/request/show/xxxxx  -
> outgoing message section
> clicking edit_outgoing link doesn't open it for me.  I have to
> right-click > open in new tab to get it to open.
Make text areas wider

Alex Skene (skenaja) he say:

> 4) https://secure.mysociety.org/admin/foi/request/edit_outgoing/xxxxx
> edit box is too narrow, should be at least 3x wider (FF v13)
> also applies to
> https://secure.mysociety.org/admin/foi/request/edit_comment/xxxxx
Correct link title

skenaja again:
> 6) https://secure.mysociety.org/admin/foi/censor/new?info_request_id=50752
> "Applies to xxxx btn btn-info" ==> "btn btn-info" doesn't look right.
Be consistent with linking request titles

skenaja yet again:
> 8) admin summary (https://secure.mysociety.org/admin/foi/) - "Classify
> responses that are still unclassified 21 days after response" and
> "Review requests marked by users as requiring your attention" both
> have links to public page as well as admin page.  For consistency,
> links to public page should prob also be added to "Fix these delivery
> and other errors" and "These require administrator attention"
Fix timeline

This was just a bug:
> 9) admin timeline (https://secure.mysociety.org/admin/foi/timeline)
> raises exception:
> "NameError in Admin_general#timeline
> Showing vendor/plugins/adminbootstraptheme/lib/views/admin_general/timeline.rhtml
> where line # raised:
> undefined local variable or method `comments' for
> #<ActionView::Base:0x7f436486e710>"
Support the new 'hide' event in the timeline

See https://github.com/sebbacon/alaveteli/commit/4ec7f6edbf2c00abc8464eafc889047f43533f90
Support git (no branch) better

If we’re not on a branch, let’s not try to link to the branch.
Add main_url in some of the places it’s needed
Add main_url in more of the places it’s needed
Another link with missing main_url
Correct URL for track listing
Remove partial conflict

It looks as though part of a conflict was inadvertently committed.