Skip to content
GitLab
Commit e458d170 authored by Elias Englmeier's avatar Elias Englmeier
Browse files

push after gitignore change

parent a52d4224
Hide whitespace changes
Inline Side-by-side
modules/.project 0 → 100644
View file @ e458d170
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>modules</name>
<comment>Project modules created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
modules/.settings/org.eclipse.buildship.core.prefs 0 → 100644
View file @ e458d170
connection.arguments=
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.java.home=null
connection.jvm.arguments=
connection.project.dir=..
derived.resources=.gradle,build
eclipse.preferences.version=1
project.path=\:modules
modules/LogIn/.classpath 0 → 100644
View file @ e458d170
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
modules/LogIn/.project 0 → 100644
View file @ e458d170
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>LogIn</name>
<comment>Project LogIn created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.liferay.ide.core.liferayNature</nature>
</natures>
</projectDescription>
modules/LogIn/.settings/org.eclipse.buildship.core.prefs 0 → 100644
View file @ e458d170
build.commands=org.eclipse.jdt.core.javabuilder
connection.arguments=
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.java.home=null
connection.jvm.arguments=
connection.project.dir=../..
containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
derived.resources=.gradle,build
eclipse.preferences.version=1
natures=org.eclipse.jdt.core.javanature
project.path=\:modules\:LogIn
modules/LogIn/bin/META-INF/resources/init.jsp 0 → 100644
View file @ e458d170
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
<%@page import="com.liferay.portal.kernel.util.ParamUtil"%>
<%@page import="com.liferay.portal.kernel.util.HtmlUtil"%>
<liferay-theme:defineObjects />
<portlet:defineObjects />
\ No newline at end of file
modules/LogIn/bin/META-INF/resources/view.jsp 0 → 100644
View file @ e458d170
<%@ include file="/init.jsp" %>
<p>
<!-- <b><liferay-ui:message key="CustomLogin1.caption"/></b>-->
<img src="<%= request.getContextPath()%>/login.png" width=3% />
<liferay-ui:message key="LogIn.caption"/>
<!-- TODO CSS class && the other ressurce folder f.e .. /images/login.png -->
</p>
<c:choose>
<c:when test="<%= themeDisplay.isSignedIn() %>">
<%
String signedInAs = HtmlUtil.escape(user.getFullName());
if (themeDisplay.isShowMyAccountIcon() && (themeDisplay.getURLMyAccount() != null)) {
String myAccountURL = String.valueOf(themeDisplay.getURLMyAccount());
signedInAs = "<a class=\"signed-in\" href=\"" + HtmlUtil.escape(myAccountURL) + "\">" + signedInAs + "</a>";
}
%>
<liferay-ui:message arguments="<%= signedInAs %>" key="you-are-signed-in-as-x" translateArguments="<%= false %>" />
</c:when>
<c:otherwise>
<%
String redirect = ParamUtil.getString(request, "redirect");
%>
<!-- actionUrlname must match corresponding Action in the MyLoginMVCActionCommand class -->
<portlet:actionURL name="/login/login" var="loginURL">
<portlet:param name="mvcRenderCommandName" value="/login/login" />
</portlet:actionURL>
<aui:form action="<%= loginURL %>" autocomplete='on' cssClass="sign-in-form" method="post" name="loginForm">
<!-- TODO CSS class && the other ressurce folder f.e .. /images/login.png -->
<!-- <img src="<%= request.getContextPath()%>/login.png" width=3% /> -->
<aui:input name="saveLastPath" type="hidden" value="<%= false %>" />
<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
<aui:input autoFocus="true" cssClass="clearable" label="email-address" name="login" showRequiredLabel="<%= false %>" type="text" value="">
<aui:validator name="required" />
<aui:validator name="email"/>
</aui:input>
<aui:input name="password" showRequiredLabel="<%= false %>" type="password">
<aui:validator name="required" />
</aui:input>
<!-- ------------------------------------------------------------------- -->
<label for="_com_liferay_login_web_portlet_LoginPortlet_rememberMe">
<input class="field" id="_com_liferay_login_web_portlet_LoginPortlet_rememberMe" name="_com_liferay_login_web_portlet_LoginPortlet_rememberMe" onclick="" type="checkbox">
Remember Me
</label>
<!-- ------------------------------------------------------------------- -->
<div class="navigation">
<ul class="list-unstyled taglib-icon-list">
<li class="" role="presentation">
<a href="http://localhost:8080/web/guest/home?p_p_id=com_liferay_login_web_portlet_LoginPortlet&amp;p_p_lifecycle=0&amp;p_p_state=maximized&amp;p_p_mode=view&amp;saveLastPath=false&amp;_com_liferay_login_web_portlet_LoginPortlet_mvcRenderCommandName=%2Flogin%2Fcreate_account" target="_self" class=" lfr-icon-item taglib-icon" id="_com_liferay_login_web_portlet_LoginPortlet_bmjh" role="menuitem">
<i class="icon-plus"> <!-- ::before --></i>
<span class="taglib-text ">Create Account</span>
</a>
<!-- ::after -->
</li>
<li class="" role="presentation"> <a href="http://localhost:8080/web/guest/home?p_p_id=com_liferay_login_web_portlet_LoginPortlet&amp;p_p_lifecycle=0&amp;p_p_state=maximized&amp;p_p_mode=view&amp;_com_liferay_login_web_portlet_LoginPortlet_mvcRenderCommandName=%2Flogin%2Fforgot_password" target="_self" class=" lfr-icon-item taglib-icon" id="_com_liferay_login_web_portlet_LoginPortlet_cosj" role="menuitem">
<i class="icon-question-sign"> <!-- ::before --></i>
<span class="taglib-text ">Forgot Password</span><!-- ::after --> </a>
</li>
</ul>
</div>
<!-- ------------------------------------------------------------------- -->
<aui:button-row>
<aui:button cssClass="btn-lg" type="submit" value="sign-in" />
</aui:button-row>
</aui:form>
</c:otherwise>
</c:choose>
\ No newline at end of file
modules/LogIn/bin/content/Language.properties 0 → 100644
View file @ e458d170
javax.portlet.display-name.LogIn=Sign in
javax.portlet.keywords.LogIn=LogIn,jsp
javax.portlet.short-title.LogIn=LogIn JSP
javax.portlet.title.LogIn=Sign In Portlet
LogIn.caption=Sign In
you-are-signed-in-as-x=You are signed in as {0}.
\ No newline at end of file
modules/MapModule/.classpath 0 → 100644
View file @ e458d170
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
modules/MapModule/.project 0 → 100644
View file @ e458d170
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>MapModule</name>
<comment>Project MapModule created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>com.liferay.ide.core.liferayNature</nature>
</natures>
</projectDescription>
modules/MapModule/.settings/org.eclipse.buildship.core.prefs 0 → 100644
View file @ e458d170
build.commands=org.eclipse.jdt.core.javabuilder
connection.arguments=
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.java.home=null
connection.jvm.arguments=
connection.project.dir=../..
containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/
derived.resources=.gradle,build
eclipse.preferences.version=1
natures=org.eclipse.jdt.core.javanature
project.path=\:modules\:MapModule
modules/MapModule/bin/META-INF/resources/init.jsp 0 → 100644
View file @ e458d170
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
<liferay-theme:defineObjects />
<portlet:defineObjects />
\ No newline at end of file
modules/MapModule/bin/META-INF/resources/view.jsp 0 → 100644
View file @ e458d170
<%@ include file="/init.jsp" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
<%@ taglib prefix="aui" uri="http://liferay.com/tld/aui" %>
<%@ taglib uri="http://liferay.com/tld/theme" prefix="theme" %>
<portlet:defineObjects />
<head>
<script>
define._amd = define.amd;
define.amd = false;
</script>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.2.0/dist/leaflet.css" />
<script src="https://unpkg.com/leaflet@1.2.0/dist/leaflet.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vex-js/4.0.0/js/vex.combined.min.js"></script>
<script>vex.defaultOptions.className = 'vex-theme-default'</script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vex-js/4.0.0/css/vex.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/vex-js/4.0.0/css/vex-theme-default.css" />
<script>
define.amd = define._amd;
</script>
</head>
<div id="map"></div>
<style>
<!--
#map {height: 600px;}
-->
</style>
<script type="text/javascript">
$(document).ready(function(){
//init the map
var map = L.map('map').setView([48.174918, 11.596160], 13);
L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
maxZoom: 18,
id: 'mapbox.streets',
accessToken: 'your.mapbox.access.token'
}).addTo(map);
//load markers from server
var ideasJsonArray = JSON.parse('${allIdeas}')
$.each(ideasJsonArray, function (index, value) {
if(value.isVisibleOnMap){
var latlng = L.latLng(value.latitude,value.longitude);
var loadedMarker = new L.Marker(latlng, {draggable:false});
loadedMarker.dbId = value.id;
loadedMarker.bindTooltip(value.title).openTooltip();
loadedMarker.bindPopup(getMarkerPopUp(value.id,value.title,value.shortdescription));
map.addLayer(loadedMarker);
}
});
function getMarkerPopUp(id, title, description){
return "<h4>" + title + "</h4>" + "<p>" + description + "</p><br>";
}
//adding a marker on click and open a modal
map.on('click', onMapClick);
function onMapClick(e) {
vex.dialog.open({
message: 'Enter a new idea:',
input: [
'<style>',
'.vex-custom-field-wrapper {',
'margin: 1em 0;',
'}',
'.vex-custom-field-wrapper > label {',
'display: inline-block;',
'margin-bottom: .1em;',
'}',
'</style>',
'<div class="vex-custom-field-wrapper">',
'<label for="title">Title</label>',
'<div class="vex-custom-input-wrapper">',
'<input name="title" type="string" placeholder="Title" size="35" />',
'</div>',
'<div class="vex-custom-field-wrapper">',
'<label for="shortdescription">Short Desription</label>',
'<div class="vex-custom-input-wrapper">',
'<input name="shortdescription" type="string" placeholder="Short Description" size="35" />',
'</div>',
'<div class="vex-custom-field-wrapper">',
'<label for="description">Desription</label>',
'<div class="vex-custom-input-wrapper">',
'<input name="description" type="string" placeholder="Description" size="35" />',
'</div>',
].join(''),
callback: function (data) {
if (!data) {
return;
}
//post to db
Liferay.Service(
'/idea.ideas/insert-new-idea',
{
title: data.title,
type: null,
userId: themeDisplay.getUserId(),
icon: null,
shortDescription: data.shortdescription,
description: data.description,
latitude: e.latlng.lat ,
longitude: e.latlng.lng ,
published: true,
showOnMap: true
},
function(obj) {
var response = jQuery.parseJSON(obj)
if(response.created){
//add new marker to map
var marker = new L.Marker(e.latlng, {draggable:false});
marker.bindPopup("<h4>" + data.title + "</h4>" + "<p>" + data.shortdescription + "</p>");
marker.bindTooltip(data.title).openTooltip();
marker.dbId = response.createdId;
map.addLayer(marker);
vex.dialog.alert({
message: 'New Idea successfully created',
callback: function (value) {
Liferay.fire('refreshIdeaBoard', {refresh :true});
}
})
}else{
vex.dialog.alert(response.errorMsg);
}
}
);
}
});
};
});
/*
Rest API example
$.getJSON(serverPrefix + "o/mapApi/mapService/markers", function(data){
$.each(data, function (index, value) {
var latlng = L.latLng(value.latitude,value.longitude);
var loadedMarker = new L.Marker(latlng, {draggable:false});
//loadedMarker.bindTooltip(value.title).openTooltip();
loadedMarker.bindPopup("<h4>" + value.title + "</h4>" + "<p>" + value.description + "</p>");
map.addLayer(loadedMarker);
});
}); */
//Liferay get Service example
/* Liferay.Service(
'/idea.ideas/get-all-ideas',
function(data) {
var received = jQuery.parseJSON(data);
$.each(received, function (index, value) {
if(value.showOnMap){
var latlng = L.latLng(value.latitude,value.longitude);
var loadedMarker = new L.Marker(latlng, {draggable:false});
loadedMarker.dbId = value.id;
loadedMarker.bindTooltip(value.title).openTooltip();
loadedMarker.bindPopup(getMarkerPopUp(value.id,value.title,value.description));
map.addLayer(loadedMarker);
}
});
}
); */
</script>
\ No newline at end of file
modules/MapModule/bin/content/Language.properties 0 → 100644
View file @ e458d170
javax.portlet.display-name.MapModule=MapModule JSP
javax.portlet.keywords.MapModule=MapModule,jsp
javax.portlet.short-title.MapModule=MapModule JSP
javax.portlet.title.MapModule=MapModule JSP Portlet
MapModule.caption=MapModule!
\ No newline at end of file
modules/MapModuleSoy/.classpath 0 → 100644
View file @ e458d170
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment