Commit 8aa9c66132782802aebf4b36e1e661320dc6dfaf

arvind
Tue Sep 02 15:00:27 IST 2014

Tree SHA1: a7c6434
Parent SHA1: 463422c (Merge branch 'ocd' of github.com:janastu/swtr into ocd)
raw diff | raw patch

Reverting index.html to a older commit, because of an unclean merge.

Diff rendering mode:
inline
side by side


10	10	<link href="{{ url_for('static', filename='css/bootstrap-theme.min.css') }}" rel="stylesheet">
11	11	<link href="{{ url_for('static', filename='css/annotorious.css') }}" rel="stylesheet">
12	12	<link href="{{ url_for('static', filename='css/swtmaker.css') }}" rel="stylesheet">
13		<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-tags.css') }}" type="text/css" media="screen" />
	13	<link href="{{ url_for('static', filename='css/bootstrap-tags.css') }}" rel="stylesheet">
14	14	</head>
15	15
16	16	<body>
…	…
31	31	CLink: Community Linked Open Cultuur Data
32	32	</a>
33	33	</div>
34		<div class="col-md-2">
35		<button class="btn btn-default" id="img-url-submit">Load</button>
36		</div>
37		<div class="col-md-8">
38		<button class="btn btn-default" id="img-url-load">Annotate</button>
39		<button class="btn btn-default" id="sweet">Sweet</button>
40		<input id="setbox" type="checkbox"/ > <label
41		id="setcontrol"><p>Show annotated areas</p></label>
42		</div>
43		</div>
44	34	<!-- Collect the nav links, forms, and other content for toggling -->
45	35	<div class="collapse navbar-collapse" id="swtr-navbar-collapse">
46	36	<ul class="nav navbar-nav navbar-right">
…	…
52	52	</a></li>
53	53	</ul>
54	54	</div>
	55	</div>
55	56	</header>
56	57
57	58	<div id="swtr-root" class="container">
…	…
154	154	imitative origin.]
155	155	</p>
156	156	</footer>
157
158	157	</div>
159	158
160	159	<div id="play-page" class="page"></div>
…	…
181	181
182	182	<script>
183	183	window.swtr = window.swtr \|\| {};
184		swtr.swtstoreURL = function() { return '{{ conf.swtstoreURL }}'; }
185		swtr.endpoints = {'get': '/sweets/q', 'post': '/sweets', 'auth':
186		'/authenticate'};
187	184	swtr.swtstoreURL = function() { return '{{ config.swtstoreURL }}'; }
188	185	swtr.endpoints = {
189	186	'get': '/api/sweets/q',
…	…
194	194	swtr.app_id = '{{ config.app_id }}';
195	195	swtr.oauth_redirect_uri = '{{ config.redirect_uri }}';
196	196	window.onload = function() {
197		swtr.init();
	197	swtr.init();
198	198	};
199	199	</script>
200	200	<script src="{{ url_for('static', filename='js/lib/jquery-1.10.2.min.js') }}"></script>
…	…
205	205	<script src="{{ url_for('static', filename='js/lib/backbone-1.0.0.min.js') }}"></script>
206	206	<script src="{{ url_for('static', filename='js/lib/annotorious.debug.js') }}"></script>
207	207	<script src="{{ url_for('static', filename='js/lib/custom-fields-plugin.js') }}"></script>
208		<script src="{{ url_for('static', filename='js/lib/label.js') }}"></script>
209		<script type="text/javascript" src="{{ url_for('static', filename='js/lib/bootstrap-tags.min.js') }}"></script>
210		<!--script src="https://login.persona.org/include.js"></script-->
211		<script src="{{ url_for('static', filename='js/swtmaker.js') }}"></script>
212	208	<script src="{{ url_for('static', filename='js/oauth.js') }}"></script>
213	209	<script src="{{ url_for('static', filename='js/lib/bootstrap-tags.min.js') }}"></script>
214	210	<script src="{{ url_for('static', filename='js/img_swtr.js') }}"></script>

Commit 8aa9c66132782802aebf4b36e1e661320dc6dfaf

Gitorious