old-git.evergreen-ils.org Git - contrib/Conifer.git/commit

projects / contrib / Conifer.git / commit

author	Bill Erickson <berick@esilibrary.com>
	Tue, 16 Aug 2011 15:34:11 +0000 (11:34 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Tue, 16 Aug 2011 16:12:38 +0000 (12:12 -0400)
commit	4fa33a9e8b20655709bb636c3c1cd22bb6478e41
tree	3d055bc6092cec23bade140e3079d3638d1860e7	tree
parent	b795757787c3cd1aa8710eaeccd1c7fde991ac17	commit \| diff
parent	bf6ebc61b5573667d6e8c42d5362c710732bc66d	commit \| diff

Merged esi/template-toolkit-opac and repaired some merge conflicts

Note to self: the simple/detail view options on the results page will
need some tweaking, particularly since many/most will want to see the
detail view by default.

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Evergreen contribs

RSS Atom

Open-ILS/src/templates/default/opac/parts/coded_value_selector.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/result/table.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/searchbar.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/results.tt2	diff1 \|	\|	blob \| history
Open-ILS/web/css/skin/default/opac/style.css	diff1 \|	diff2 \|	blob \| history