Commit 380398887f6e6d74be6649f9d2fc1b4db6e58593

Anon Ray
Sat Aug 30 22:23:26 IST 2014

Tree SHA1: 07291a4
Parent SHA1: ab0e730 (Adding js files needed for linked-data's tag cloud view)
raw diff | raw patch

Improve and integrate the search component

  - Minor code changes to search component to work with the new routing.
  - New mark feature when clicking on resulting image in OCD search.

Diff rendering mode:
inline
side by side


50	50	margin-bottom: 10px;
51	51	}
52	52
	53	.ocd-item.col-md-4 {
	54	width: 32.3333%;
	55	}
53	56	.ocd-item {
54	57	padding-bottom: 4px;
55	58	border: 1px solid #ddd;
56	59	border-radius: 4px;
57		margin-bottom: 20px;
	60	margin: 0 5px 20px 5px;
58	61	text-align: center;
	62	}
	63	.ocd-item-cover {
	64	position: absolute;
	65	border: 1px solid #ddd;
	66	box-shadow: 1px 1px 3px #ccc;
	67	width: 100%;
	68	padding: 12px;
	69	background: #fff;
	70	height: 60px;
	71	margin-left: -15px;
	72	}
	73	.ocd-item .text{
	74	margin-top: 3px;
59	75	}
60	76
61	77	.thumb-image {


466	466	el: $('#ocd-view'),
467	467	events: {
468	468	'click .ocd-item a': 'onImgClick',
	469	'click .ocd-item-cover .close': 'onCoverCloseClick',
	470	'click .ocd-item-mark': 'onMarkClick',
469	471	'click .pager li': 'onPagerClick'
470	472	},
471	473	initialize: function(opts) {
…	…
477	477	this.page = 0;
478	478	this.item_template = _.template($('#ocd-item-template').html());
479	479	this.base_template = _.template($('#ocd-view-base-template').html());
	480	this.cover_template = _.template($('#ocd-item-cover-template').html());
480	481	this.render();
481	482	},
482	483	render: function() {
…	…
498	498	$row_el.append(this.item_template({
499	499	title: item._source.title,
500	500	media_url: item._source.media_urls[0].url,
501		authors: item._source.authors
	501	authors: item._source.authors,
	502	description: item._source.description
502	503	}));
503	504	}, this);
504	505	this.resolveOCDURLs();
…	…
561	561	return false;
562	562	},
563	563	onImgClick: function(event) {
	564	//console.log('onImgClick');
564	565	event.preventDefault();
565	566	// TODO: init the image anno
566		var url = $(event.currentTarget).find('img').attr('src');
	567	this.highlightImg(event);
567	568	//swtr.appView.loadURL(url, 'image');
568	569	return false;
	570	},
	571	highlightImg: function(event) {
	572	//console.log('highlightImg');
	573	var elem = $(event.currentTarget).parent().parent();
	574	// if .ocd-item-cover exists return
	575	if(elem.find('.ocd-item-cover').length) {
	576	return;
	577	}
	578	//console.log(elem);
	579	elem.prepend(this.cover_template());
	580	$(elem.find('.ocd-item-cover')[0]).slideDown('slow');
	581	},
	582	onCoverCloseClick: function(event) {
	583	var elem = $(event.currentTarget).parent();
	584	elem.slideUp('slow');
	585	elem.remove();
	586	},
	587	onMarkClick: function(event) {
	588	var url = $(event.currentTarget).parent().parent().
	589	find('img').attr('src');
	590	console.log('load image anno', url);
569	591	},
570	592	search: function(data, cb) {
571	593	swtr.appView.$overlay.show();


262	262	<img src="" class="responsive thumb-image">
263	263	</a>
264	264	</div>
265		<div>Authors: <%= authors %> </div>
	265	<div class="text">Authors: <%= authors %> </div>
	266	<div class="text">Description: <%= description %> </div>
	267	</div>
	268	</script>
	269	<script type="text/template" id="ocd-item-cover-template">
	270	<div class="ocd-item-cover">
	271	Mark and load this image to annotate
	272	<button class="btn btn-xs btn-default pull-left ocd-item-mark">Mark</button>
	273	<a class="close">×</a>
	274	<div class="clearfix"></div>
266	275	</div>
267	276	</script>
268	277	<script type="text/template" id="filter-users">

Commit 380398887f6e6d74be6649f9d2fc1b4db6e58593

Gitorious