• R/O
  • SSH
  • HTTPS

clearfybusiness: 提交


Commit MetaInfo

修訂202 (tree)
時間2018-11-02 17:18:40
作者daianji

Log Message

タイムカードのデザイン変更
ど派手にしてみた。

Change Summary

差異

--- org.clearfy/org.clearfy.plugin.matching/src/main/java/org/clearfy/plugin/matching/Initializer.java (revision 201)
+++ org.clearfy/org.clearfy.plugin.matching/src/main/java/org/clearfy/plugin/matching/Initializer.java (revision 202)
@@ -31,6 +31,7 @@
3131 import org.clearfy.components.ClearfyMenu;
3232 import org.clearfy.content.data.FrontPage;
3333 import org.clearfy.datawrapper.ClearfyDatabaseException;
34+import org.clearfy.plugin.matching.contents.ContactForm;
3435 import org.clearfy.plugin.matching.contents.MatchingProfile;
3536 import org.clearfy.plugin.matching.contents.NewAdItem;
3637 import org.clearfy.plugin.matching.data.AdItem;
@@ -78,7 +79,7 @@
7879 ClearfyRoles.AUTH_LEVEL_GUEST,
7980 ClearfyMenu.ALLOW_UPPER_LEVEL,
8081 PluginPage.class,
81- PluginSection.class,
82+ ContactForm.class,
8283 true
8384 );
8485
--- org.clearfy/org.clearfy.plugin.matching/src/main/java/org/clearfy/plugin/matching/contents/ContactForm.html (nonexistent)
+++ org.clearfy/org.clearfy.plugin.matching/src/main/java/org/clearfy/plugin/matching/contents/ContactForm.html (revision 202)
@@ -0,0 +1,74 @@
1+<!DOCTYPE html>
2+<!--
3+The MIT License
4+
5+Copyright 2016 tmworks.
6+
7+Permission is hereby granted, free of charge, to any person obtaining a copy
8+of this software and associated documentation files (the "Software"), to deal
9+in the Software without restriction, including without limitation the rights
10+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+copies of the Software, and to permit persons to whom the Software is
12+furnished to do so, subject to the following conditions:
13+
14+The above copyright notice and this permission notice shall be included in
15+all copies or substantial portions of the Software.
16+
17+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+THE SOFTWARE.
24+-->
25+<html>
26+ <head>
27+ <title>TODO supply a title</title>
28+ <meta charset="UTF-8">
29+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
30+ </head>
31+ <body>
32+ <wicket:extend>
33+ <!-- ContactForm.html -->
34+ <form>
35+ <div class="recordEditorLine">
36+ <div class="recordEditorCaption">
37+ <label>お名前</label>
38+ </div>
39+ <div class="recordEditorValue">
40+ <input type="text" />
41+ </div>
42+ </div>
43+ <div class="recordEditorLine">
44+ <div class="recordEditorCaption">
45+ <label>eメール(必須)</label>
46+ </div>
47+ <div class="recordEditorValue">
48+ <input type="text" />
49+ </div>
50+ </div>
51+ <div class="recordEditorLine">
52+ <div class="recordEditorCaption">
53+ <label>電話番号(任意)</label>
54+ </div>
55+ <div class="recordEditorValue">
56+ <input type="text" />
57+ </div>
58+ </div>
59+ <div class="recordEditorLine">
60+ <label class="recordEditorCaption">お問い合わせ内容</label>
61+ <div class="recordEditorValue">
62+ <textarea>
63+
64+ </textarea>
65+ </div>
66+ </div>
67+ <div class="recordEditorLine">
68+ <input type="submit" />
69+ </div>
70+
71+ </form>
72+ </wicket:extend>
73+</body>
74+</html>
--- org.clearfy/org.clearfy.plugin.matching/src/main/java/org/clearfy/plugin/matching/contents/ContactForm.java (nonexistent)
+++ org.clearfy/org.clearfy.plugin.matching/src/main/java/org/clearfy/plugin/matching/contents/ContactForm.java (revision 202)
@@ -0,0 +1,41 @@
1+/*
2+ * Copyright 2018 Takahiro MURAKAMI.
3+ *
4+ * Licensed under the Apache License, Version 2.0 (the "License");
5+ * you may not use this file except in compliance with the License.
6+ * You may obtain a copy of the License at
7+ *
8+ * http://www.apache.org/licenses/LICENSE-2.0
9+ *
10+ * Unless required by applicable law or agreed to in writing, software
11+ * distributed under the License is distributed on an "AS IS" BASIS,
12+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ * See the License for the specific language governing permissions and
14+ * limitations under the License.
15+ */
16+package org.clearfy.plugin.matching.contents;
17+
18+import org.clearfy.ClearfyPage;
19+import org.clearfy.ClearfySection;
20+
21+/**
22+ * お問い合わせフォーム
23+ *
24+ * @author Takahiro MURAKAMI
25+ */
26+public class ContactForm extends ClearfySection {
27+
28+ public ContactForm(String id, ClearfyPage page) {
29+ super(id, page);
30+ }
31+
32+ @Override
33+ public void drawContent() {
34+ }
35+
36+ @Override
37+ public String getTitle() {
38+ return this.getSentence("お問い合わせ");
39+ }
40+
41+}
--- org.clearfy/org.clearfy.plugin.timecard/src/main/webapp/theme/default/style.css (revision 201)
+++ org.clearfy/org.clearfy.plugin.timecard/src/main/webapp/theme/default/style.css (revision 202)
@@ -201,7 +201,7 @@
201201 height: auto;
202202 min-height: 6vh;
203203 max-height: 6vh;
204- filter: invert(1);
204+ filter: brightness(0) invert(1);
205205 }
206206
207207 .nav-unshown {
@@ -281,6 +281,7 @@
281281 border-style: solid;
282282 border-width: 1px;
283283 font-size: calc(0.5em + 0.5vw);
284+ border-color: #0006;
284285 }
285286 @media print{
286287 .grid{
@@ -289,7 +290,7 @@
289290 }
290291
291292 .grid th {
292- background-color: rgba(0,0,0,0.3);
293+ background-color: rgba(173, 173, 173, 0.3);
293294 font-weight: normal;
294295 }
295296
@@ -302,6 +303,7 @@
302303 padding-right: 0.2em;
303304 text-align: center;
304305
306+ border-color: #0006;
305307 }
306308
307309 .grid td a, .grid th a{
@@ -310,7 +312,7 @@
310312 }
311313
312314 .odd{
313- background-color: rgba(0,0,0,0.3);
315+ background-color: rgba(179, 179, 179, 0.3);
314316 }
315317
316318 .clearfyTable {
@@ -325,7 +327,7 @@
325327 }
326328
327329 .clearfyTable th{
328- background-color: lightgray;
330+ background-color: #d8bbf34d;
329331 }
330332
331333 .section.title{
@@ -484,10 +486,13 @@
484486 height: 1.2em;;
485487 vertical-align: middle;
486488 filter: brightness(0) invert(1);
489+ /*! -ms-filter: brightness(0); */
487490 }
488491
489492 #formCaption{
490- color: rgba(255,100,0,1);
493+ color: rgb(0, 48, 255);
494+ /*! text-shadow: 1px 1px #00000080; */
495+ /*! font-weight: bold; */
491496 }
492497 @media print{
493498 #formCaption{
@@ -637,9 +642,17 @@
637642 background-size: cover;
638643 background-position: 50% 50%;
639644 }
645+@media (max-width: 1080px){
646+ .page-body{
647+ background-image: url("../../../../../theme/default/main_imageV.png");
648+ background-position: 50% 50%;
649+ background-size: cover;
650+ }
651+}
640652 @media print{
641653 .page-body{
642654 background-image: none;
655+ background-position: unset;
643656
644657 }
645658
@@ -653,6 +666,7 @@
653666 position: relative;
654667 overflow: auto;
655668 /*! background: rgba(255,255,255,0.8); */
669+ padding: 0.5em;
656670 }
657671 @media (min-width: 1080px){
658672 .section-box{
@@ -662,5 +676,6 @@
662676 right: 0;
663677 bottom: 0;
664678 overflow: auto;
679+ border-radius: 10px 0px 0px 10px;
665680 }
666681 }
\ No newline at end of file
Show on old repository browser