Skip to content

Commit

Permalink
fixes for some outdate archive pages
Browse files Browse the repository at this point in the history
  • Loading branch information
sgsinclair committed Apr 8, 2016
1 parent 39d4e4a commit fa18be8
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 19 deletions.
7 changes: 7 additions & 0 deletions src/main/webapp/app/VoyantCorpusApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ Ext.define('Voyant.VoyantCorpusApp', {
var me = this;
var view = me.getViewport()
view.mask(this.localize("fetchingCorpus"));
if (params.archive) { // fix a few URLs we know about
if (Ext.isString(params.archive)) {params.archive=[params.archive]}
params.archive = params.archive.map(function(archive) {
return archive.replace('/blogs.sub.uni-hamburg.de/hup/lhn/', '/wikis.sub.uni-hamburg.de/lhn/index.php/')
.replace('/hup.sub.uni-hamburg.de/', '/wikis.sub.uni-hamburg.de/')
})
}

new Corpus(params).then(function(corpus) {
if (corpus.requiresPassword() && !me.getViewport().query("panel").every(function(panel) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Ext.onReady(function(){
"Some highlights of <a href='docs/#!/guide/new' target='_blank'>what's new</a> include more options for <a href='docs/#!/guide/corpuscreator' target='_blank'>creating</a>, "+
"<a href='docs/#!/guide/modifyingcorpus' target='_blank'>modifying</a> and <a href='docs/#!/guide/corpuscreator-section-access-management' target='_blank'>accessing</a> corpora, "+
"more powerful <a href='docs/#!/guide/search' target='_blank'>search</a> capabilities, "+
"new tools (like <a href='docs/#!/guide/phrases' target='_blank'>Phrases</a>) and tools rewritten in HTML5 (like <a href='docs/#!/guide/cirrus' target='_blank'>Cirrus</a> – no more Flash!), "+
"new tools (like <a href='docs/#!/guide/phrases' target='_blank'>Phrases</a>) and tools rewritten in HTML5 (like <a href='docs/#!/guide/cirrus' target='_blank'>Cirrus</a> - no more Flash!), "+
"as well as significant speed and scale improvements all around.</p>"+
"<p>If you're new to Voyant, you may want to consult our guide to <a href='docs/#!/guide/start' target='_blank'>Getting Started</a>, as well as our companion book <a href='http://https://mitpress.mit.edu/books/hermeneutica' target='_blank'>Hermeneutica: Computer-Assisted Interpretation in the Humanities</a> and site <a href='http://https://mitpress.mit.edu/books/hermeneutica' target='_blank'>Hermeneuti.ca</a>. "+
"You might be interested in "+
Expand Down
14 changes: 12 additions & 2 deletions src/main/webapp/resources/voyant/current/voyant.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* This file created by JSCacher. Last modified: Fri Apr 08 09:52:55 EDT 2016 */
/* This file created by JSCacher. Last modified: Fri Apr 08 17:05:47 EDT 2016 */
function Bubblelines(config) {
this.container = config.container;
this.externalClickHandler = config.clickHandler;
Expand Down Expand Up @@ -7261,6 +7261,7 @@ Ext.define('Voyant.panel.Contexts', {
mixins: ['Voyant.panel.Panel'],
requires: ['Voyant.data.store.Contexts'],
alias: 'widget.contexts',
isConsumptive: true,
statics: {
i18n: {
title: {en: "Contexts"},
Expand Down Expand Up @@ -7848,6 +7849,7 @@ Ext.define('Voyant.panel.CorpusCreator', {
requires: ['Voyant.data.model.Corpus'],
mixins: ['Voyant.panel.Panel'],
alias: 'widget.corpuscreator',
isConsumptive: true,
statics: {
i18n: {
title: {en: "Add Texts"},
Expand Down Expand Up @@ -9627,6 +9629,7 @@ Ext.define('Voyant.panel.Documents', {
extend: 'Ext.grid.Panel',
mixins: ['Voyant.panel.Panel'/*,'Voyant.util.Localization'*/],
alias: 'widget.documents',
isConsumptive: true,
statics: {
i18n: {
title: {en: "Documents"},
Expand Down Expand Up @@ -16341,6 +16344,7 @@ Ext.define('Voyant.panel.CorpusSet', {
requires: ['Voyant.panel.VoyantTabPanel','Voyant.panel.Cirrus', 'Voyant.panel.Summary', 'Voyant.panel.CorpusTerms', 'Voyant.panel.Reader', 'Voyant.panel.Documents', 'Voyant.panel.Trends', 'Voyant.panel.Contexts', 'Voyant.panel.Phrases', 'Voyant.panel.DocumentTerms','Voyant.panel.CorpusCollocates','Voyant.panel.CollocatesGraph','Voyant.panel.StreamGraph'],
mixins: ['Voyant.panel.Panel'],
alias: 'widget.corpusset',
isConsumptive: true,
statics: {
i18n: {
title: {en: "Corpus View"},
Expand Down Expand Up @@ -17014,10 +17018,16 @@ Ext.define('Voyant.VoyantCorpusApp', {
var me = this;
var view = me.getViewport()
view.mask(this.localize("fetchingCorpus"));
if (params.archive) { // fix a few URLs we know about
if (Ext.isString(params.archive)) {params.archive=[params.archive]}
params.archive = params.archive.map(function(archive) {
return archive.replace('/blogs.sub.uni-hamburg.de/hup/lhn/', '/wikis.sub.uni-hamburg.de/lhn/index.php/')
.replace('/hup.sub.uni-hamburg.de/', '/wikis.sub.uni-hamburg.de/')
})
}

new Corpus(params).then(function(corpus) {
if (corpus.requiresPassword() && !me.getViewport().query("panel").every(function(panel) {
console.warn(!panel.isConsumptive)
return !panel.isConsumptive
})) {
var noPasswordAccess = corpus.getNoPasswordAccess();
Expand Down
Loading

0 comments on commit fa18be8

Please sign in to comment.