Skip to content
Snippets Groups Projects
Commit a0e2f989 authored by Eike Cochu's avatar Eike Cochu
Browse files

updated artifact names

renamed artifacts to project names
added mnemonic underline to menu
fixed bootstrap.sh service start problems
parent 0389ee2d
Branches
No related tags found
No related merge requests found
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/" source-path="/src/main/public"/> <wb-resource deploy-path="/" source-path="/src/main/public"/>
<dependent-module archiveName="util-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/vipra-util/vipra-util"> <dependent-module archiveName="vipra-util-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/vipra-util/vipra-util">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<property name="java-output-path" value="/vipra-backend/target/classes"/>
<property name="context-root" value="vipra"/> <property name="context-root" value="vipra"/>
<property name="java-output-path" value="/vipra-backend/target/classes"/>
</wb-module> </wb-module>
</project-modules> </project-modules>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jaxrs" version="2.0"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="java" version="1.8"/> <installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.1"/>
<installed facet="jst.jaxrs" version="2.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project> </faceted-project>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.vipra</groupId> <groupId>de.vipra</groupId>
<artifactId>backend</artifactId> <artifactId>vipra-backend</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<!-- Workspace --> <!-- Workspace -->
<dependency> <dependency>
<groupId>de.vipra</groupId> <groupId>de.vipra</groupId>
<artifactId>util</artifactId> <artifactId>vipra-util</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.vipra</groupId> <groupId>de.vipra</groupId>
<artifactId>cmd</artifactId> <artifactId>vipra-cmd</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<!-- Workspace --> <!-- Workspace -->
<dependency> <dependency>
<groupId>de.vipra</groupId> <groupId>de.vipra</groupId>
<artifactId>util</artifactId> <artifactId>vipra-util</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
<div class="collapse navbar-collapse" id="vipra-navbar-collapse-1"> <div class="collapse navbar-collapse" id="vipra-navbar-collapse-1">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="explorer">Explorer</a> <a ui-sref="explorer"><span class="mnemonic">E</span>xplorer</a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="articles">Articles</a> <a ui-sref="articles"><span class="mnemonic">A</span>rticles</a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="topics">Topics</a> <a ui-sref="topics"><span class="mnemonic">T</span>opics</a>
</li> </li>
</ul> </ul>
<form class="navbar-form navbar-left" role="search" ng-hide="$state.current.name === 'index'"> <form class="navbar-form navbar-left" role="search" ng-hide="$state.current.name === 'index'">
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</form> </form>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li ng-class="{'text-italic':rootModels.topicModel}"> <li ng-class="{'text-italic':rootModels.topicModel}">
<a data-toggle="modal" data-target="#topicModelModal" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.id : 'Models'}}" ng-attr-title="{{rootModels.topicModel.modelConfig.description}}"></a> <a ng-click="chooseTopicModel()" ng-bind-template="{{rootModels.topicModel ? rootModels.topicModel.id : 'Models'}}" ng-attr-title="{{rootModels.topicModel.modelConfig.description}}"></a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="about"> <a ui-sref="about">
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
search: null search: null
}; };
$scope.queryTopicModels = function() {
TopicModelFactory.query({ TopicModelFactory.query({
fields: '_all' fields: '_all'
}, function(data) { }, function(data) {
...@@ -25,8 +26,10 @@ ...@@ -25,8 +26,10 @@
}, function(err) { }, function(err) {
$scope.errors = err; $scope.errors = err;
}); });
};
$scope.chooseTopicModel = function() { $scope.chooseTopicModel = function() {
$scope.queryTopicModels();
$scope.rootModels.topicModelModalOpen = true; $scope.rootModels.topicModelModalOpen = true;
$('#topicModelModal').modal(); $('#topicModelModal').modal();
if ($scope.rootModels.topicModel) if ($scope.rootModels.topicModel)
......
...@@ -411,6 +411,13 @@ topic-menu { ...@@ -411,6 +411,13 @@ topic-menu {
font-style: italic; font-style: italic;
} }
.mnemonic {
*:hover > &,
*:hover {
text-decoration: underline;
}
}
@-moz-keyframes spin { @-moz-keyframes spin {
100% { 100% {
-moz-transform: rotateY(360deg); -moz-transform: rotateY(360deg);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.vipra</groupId> <groupId>de.vipra</groupId>
<artifactId>util</artifactId> <artifactId>vipra-util</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<properties> <properties>
......
...@@ -20,10 +20,11 @@ echo "TOMCAT8_GROUP=vagrant" >> /etc/default/tomcat8 ...@@ -20,10 +20,11 @@ echo "TOMCAT8_GROUP=vagrant" >> /etc/default/tomcat8
chown -R vagrant.vagrant /var/log/tomcat8 /var/cache/tomcat8 /var/lib/tomcat8/conf/* chown -R vagrant.vagrant /var/log/tomcat8 /var/cache/tomcat8 /var/lib/tomcat8/conf/*
# webapp directory # webapp directory
rm -f /vagrant/vm/webapps rm -rf /vagrant/vm/webapps
mkdir /vagrant/vm/webapps mkdir /vagrant/vm/webapps
ln -sf /vagrant/vm/webapps /var/lib/tomcat8/webapps ln -sf /vagrant/vm/webapps /var/lib/tomcat8/webapps
systemctl enable tomcat8
systemctl restart tomcat8 systemctl restart tomcat8
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
...@@ -33,6 +34,7 @@ wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/ ...@@ -33,6 +34,7 @@ wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/
gdebi -n elasticsearch-2.1.1.deb gdebi -n elasticsearch-2.1.1.deb
rm elasticsearch-2.1.1.deb rm elasticsearch-2.1.1.deb
systemctl enable elasticsearch
systemctl restart elasticsearch systemctl restart elasticsearch
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment