Skip to content

Commit

Permalink
merged
Browse files Browse the repository at this point in the history
  • Loading branch information
Bosn committed Dec 12, 2013
2 parents 2d9e527 + 26b51d5 commit 129e81d
Show file tree
Hide file tree
Showing 31 changed files with 1,590 additions and 13 deletions.
9 changes: 9 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ bak
*.class
bin/
target
.classpath
.settings
.project
48 changes: 48 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>RAP</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
13 changes: 13 additions & 0 deletions .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="WebContent"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
<attribute name="hide" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.InternetExplorer"/>
<classpathentry kind="output" path=""/>
</classpath>
3 changes: 3 additions & 0 deletions .settings/com.genuitec.eclipse.j2eedt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#Thu Dec 12 15:44:45 CST 2013
eclipse.preferences.version=1
useAssemblyMapping=true
5 changes: 5 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Mon Aug 09 10:46:19 CST 2010
eclipse.preferences.version=1
encoding//WebContent/tcom/const.inc.vm=UTF-8
encoding//src/database/test-data.sql=UTF-8
encoding/<project>=UTF-8
13 changes: 13 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#Thu Dec 12 15:44:46 CST 2013
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
5 changes: 5 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Thu Dec 12 15:44:43 CST 2013
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
9 changes: 9 additions & 0 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="RAP">
<wb-resource deploy-path="/" source-path="/WebContent"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<property name="java-output-path" value="/RAP/build/classes"/>
<property name="context-root" value="/rap"/>
</wb-module>
</project-modules>
9 changes: 9 additions & 0 deletions .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<fixed facet="java"/>
<fixed facet="jst.web"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.container
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.eclipse.wst.jsdt.launching.baseBrowserLibrary
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.name
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Window
3 changes: 3 additions & 0 deletions .settings/org.eclipse.wst.ws.service.policy.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#Thu Aug 05 13:37:25 CST 2010
eclipse.preferences.version=1
org.eclipse.wst.ws.service.policy.projectEnabled=false
135 changes: 135 additions & 0 deletions WebContent/org/group/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
.groups-con {
padding: 10px;
}

.groups-con h2 {
font-size: 24px;
margin-bottom: 36px;
}

.groups-con .groups .group {
border-top: 1px solid #CCC;
margin-top: 30px;
}
.groups-con .groups .group h3 {
height: 36px;
line-height: 36px;
font-size: 22px;
color: #999;
}

.groups-con .groups .group h3 .btn-hover {
display: none !important;
}

.groups-con .groups .group:hover h3 .btn-hover {
display: inline-block !important;
}

.groups-con .groups .group .box {
float: left;
width: 200px;
height: 128px;
border: 1px solid #DDD;
margin: 10px 10px 10px 0;
position: relative;
cursor: pointer;
}

.groups-con .groups .group .box .star {
color: #F90;
position: absolute;
right: -8px;
top: -10px;
font-size: 24px;
}

.groups-con .groups .group .box-to-add {
float: left;
width: 200px;
height: 128px;
border: 1px dashed #DDD;
margin: 10px 10px 10px 0;
position: relative;
cursor: pointer;
opacity: 0.7;
background: url('/rap/stat/img/plus.png') no-repeat center center;
background-color: #FFF;
-webkit-transition: .3s;
-moz-transition: .3s;
-ms-transition: .3s;
-o-transition: .3s;
transition: .3s;
}

.groups-con .groups .group .box:hover {
box-shadow: 2px 2px 8px rgba(0, 0, 0, 0.4);
}

.groups-con .groups .group .box-to-add:hover {
opacity: 1;
background-color: #F2F2F2;
}

.groups-con .groups .group .box .info {
padding: 10px;
}

.groups-con .groups .group .box .intro {
color: rgba(0, 0, 0, 0.3);
}

@-webkit-keyframes spaceboots {
0% { -webkit-transform: translate(2px, 1px) rotate(0deg); }
10% { -webkit-transform: translate(-1px, -2px) rotate(-1deg); }
20% { -webkit-transform: translate(-3px, 0px) rotate(1deg); }
30% { -webkit-transform: translate(0px, 2px) rotate(0deg); }
40% { -webkit-transform: translate(1px, -1px) rotate(1deg); }
50% { -webkit-transform: translate(-1px, 2px) rotate(-1deg); }
60% { -webkit-transform: translate(-3px, 1px) rotate(0deg); }
70% { -webkit-transform: translate(2px, 1px) rotate(-1deg); }
80% { -webkit-transform: translate(-1px, -1px) rotate(1deg); }
90% { -webkit-transform: translate(2px, 2px) rotate(0deg); }
100% { -webkit-transform: translate(1px, -2px) rotate(-1deg); }
}
.shake {
-webkit-animation-name: spaceboots;
-webkit-animation-duration: 0.8s;
-webkit-transform-origin:50% 50%;
-webkit-animation-iteration-count: 2;
-webkit-animation-timing-function: linear;
display:inline-block
}

.groups-con .groups .group .box .status {
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 30px;
padding: 5px;
color: rgba(0, 0, 0, 0.4);
background-color: rgba(0, 0, 0, 0.1);
text-align: center;
}

.groups-con .groups .group .box .title {
font-size: 18px;
color: #6D8095;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}

.groups-con .groups .group .group-name {
margin-right: 10px;
}

.groups-con .groups .group .modify-con {
display: none;
}

.groups-con .groups .group .modify-name {
display: inline;
width: 300px;
}
Loading

0 comments on commit 129e81d

Please sign in to comment.