Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Merge amsl.technology into OntoWiki #411

Open
wants to merge 517 commits into
base: develop
Choose a base branch
from

Conversation

white-gecko
Copy link
Member

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.

a-nnika and others added 30 commits September 11, 2015 10:47
* replace save icon with new icon
* drop hidden class on inline edit
* increase width of filter overlay
* initially use option value for filter
Copy link
Member Author

@white-gecko white-gecko left a 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.

@@ -37,3 +37,6 @@ build/
# vagrant stuff
Vagrantfile
.vagrant

# export folder
dumps/
Copy link
Member Author

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
Copy link
Member Author

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)"
Copy link
Member Author

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();
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should work

$renderedList = $view->partial(
'partials/list.phtml',
array(
'listName' => $listName,
'instances' => $list,
'mainTemplate' => $mainTemplate,
'other' => $other
'other' => $other,
'heading' => $listHeading
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should work

case 'csv':
$contentType = 'text/csv';
$filename = 'query-result.csv';
break;
}
Copy link
Member Author

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

@@ -8,15 +8,15 @@
<div class="has-contextmenu-area" >
<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>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very good

</h3>
open with:
<?php echo $this->_('Open with:'); ?>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very good

<?php
//always show link to queryeditor
$QEurl = new OntoWiki_Url(array('controller' => 'queries', 'action'=>'editor'), array());
$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>
Copy link
Member Author

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));
}
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

new extensions …

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants