-
Notifications
You must be signed in to change notification settings - Fork 50
Merge amsl.technology into OntoWiki #411
base: develop
Are you sure you want to change the base?
Conversation
* increase width of filter overlay
* initially use option value for filter
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This merge has a lot of new contributions which can be presented much more overseeable if the extensions are moved to separate repositories.
Further a huge amount of the changed lines is the new amsl theme.
.vagrant | ||
|
||
# export folder | ||
dumps/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should work
url = https://github.com/amsl-project/template.ontowiki.git | ||
[submodule "extensions/deadlinehelper"] | ||
path = extensions/deadlinehelper | ||
url = https://github.com/amsl-project/deadlinehelper.ontowiki.git |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All these dependencies are replaced by composer dependencies in OntoWiki
sh -c "$(PWD)/application/scripts/vocab.sh $(PWD)" | ||
|
||
export-virtuoso: | ||
sh -c "$(PWD)/application/scripts/export.sh $(PWD)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These tasks of the Makefile are also taken over by composer.
if (($config->lists) && $config->lists->showHeading === "true") { | ||
$listHeading = $list->getTitle(); | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should work
'mainTemplate' => $mainTemplate, | ||
'other' => $other | ||
'other' => $other, | ||
'heading' => $listHeading |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should work
$contentType = 'text/csv'; | ||
$filename = 'query-result.csv'; | ||
break; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is already in the latest OntoWiki: #280
<h3> | ||
<span class="name">"<?php echo $entry['name'][0]['value']; ?>"</span> | ||
<span class="views">(<?php echo $numViews ?> views)</span> | ||
<span class="views">(<?php echo $numViews ?> <?php echo $this->_('views'); ?>)</span> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
very good
<span class="views">(<?php echo $numViews ?> <?php echo $this->_('views'); ?>)</span> | ||
</h3> | ||
open with: | ||
<?php echo $this->_('Open with:'); ?> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
very good
$QEurl->queryUri = $this->instanceUri; | ||
?> | ||
<a class="minibutton" href="<?php echo $QEurl; ?>">Editor</a> | ||
<a class="minibutton" href="<?php echo $QEurl; ?>"><?php echo $this->_('Editor'); ?></a> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
very good
|
||
$this->_response->setBody(json_encode($result)); | ||
} | ||
} No newline at end of file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
new extensions …
This Fork is not ready to be merged!
This fork is meant to get an overview on how diverged the amsl.technology branch actually is.