Skip to content

Commit

Permalink
yonafy: Apply modifications for fork project
Browse files Browse the repository at this point in the history
- Remove yobi logo
- Change update url
- Add check update option
- Change project/group default bg image
- Change navigation menu style
  • Loading branch information
doortts committed Jan 17, 2016
1 parent 5e7f61e commit 9684b12
Show file tree
Hide file tree
Showing 14 changed files with 106 additions and 84 deletions.
13 changes: 13 additions & 0 deletions app/assets/stylesheets/less/_override.less
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,16 @@ li.select2-result-with-children:first-of-type {
filter: alpha(opacity=100);
}

.welcome-table {
td {
border-top: none;
font-size: 14px;
vertical-align: middle;
}
a {
width: 85%;
}
border-bottom: 1px solid #eee;
margin-bottom: -1px;
}

37 changes: 20 additions & 17 deletions app/assets/stylesheets/less/_page.less
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

.gnb-outer {
height:40px;
background-color:#1d2d46;
background-color: #1b1b1b;

&.project-header {
background-color: rgba(0, 0, 0, 0.35);
Expand All @@ -59,9 +59,19 @@
}

.gnb-inner {
.logo-title {
background: #FF5722;
padding: 6px 10px !important;
color: #803131 !important;
border-radius: 2px;
font-weight: bold;
opacity: 0.7;
&:hover {
color:#FFF !important;
opacity: 1;
}
}
.logo {
float:left;
background-image: url("@{base-image-path}/yobi-logo.png");
background-position: 11px 10px;
background-repeat: no-repeat;
width:44px;
Expand All @@ -72,17 +82,13 @@
float: left;
width: 1px;
height: 40px;
background: #373D47;
border-left: 1px solid #03183A;
}

&:after {
content: " ";
float: left;
width: 1px;
height: 40px;
background: #373D47;
border-left: 1px solid #03183A;
margin-left:40px;
}
}
Expand Down Expand Up @@ -175,17 +181,16 @@

&.gnb-usermenu-item {
font-size: 14px;
color:#788ba7;
color: @low-white;

a {
line-height: 30px;
padding:5px 10px;
color:#788ba7;
text-decoration: none;
.transition(color 0.15s);

&:hover {
color:#FFF;
color: @blue;
}

&.usermenu-icon-button {
Expand All @@ -196,7 +201,7 @@

&.gnb-usermenu-dropdown {
font-size: 14px;
color:#788ba7;
color: @low-white;

> a {
padding:0 10px;
Expand All @@ -220,18 +225,18 @@
.transition(all 0.15s ease);
height: 0;
vertical-align: top;
border-top: 4px solid #788ba7;
border-top: 4px solid @low-white;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
}

&:hover, &:focus {
color:#FFF;
color: @blue;
text-decoration: none;

.caret {
border-top: 4px solid #FFF;
border-top: 4px solid @blue;
}
}

Expand Down Expand Up @@ -898,8 +903,6 @@
h3 {
margin:0;
padding:0;
font-size: 30px;
color:@yobi-primary;

span {
font-size:14px;
Expand Down Expand Up @@ -981,7 +984,6 @@

button {
border:1px solid rgba(0,0,0, .1);
border-top:none;
.border-radius(0 0 6px 6px);
color:@yobi-gray;
padding:0px 25px;
Expand All @@ -990,6 +992,7 @@
i {
font-size:12px;
}
border-top: 2px solid white;
}
}

Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/less/_variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

// Color
@white : #FFF;
@low-white: #efefef;
@black : #000;
@orange : #F36C22;
@purple : #8d008d;
Expand Down
7 changes: 5 additions & 2 deletions app/controllers/SiteApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,11 @@ public static Result update() throws GitAPIException {
Exception exception = null;

try {
currentVersion = Config.getCurrentVersion();
YobiUpdate.refreshVersionToUpdate();
boolean useUpdateCheck = play.Configuration.root().getBoolean("application.update.check.use");
if(useUpdateCheck){
currentVersion = Config.getCurrentVersion();
YobiUpdate.refreshVersionToUpdate();
}
} catch (Exception e) {
exception = e;
}
Expand Down
4 changes: 2 additions & 2 deletions app/models/YobiUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public class YobiUpdate {
private static final Long UPDATE_NOTIFICATION_INTERVAL_IN_MILLIS = Configuration.root()
.getMilliseconds("application.update.notification.interval", 60 * 60 * 1000L);
private static final String UPDATE_REPOSITORY_URL = Configuration.root()
.getString("application.update.repositoryUrl", "http://repo.yobi.io/naver/yobi");
.getString("application.update.repositoryUrl", "http://repo.yona.io/yona/yona");
private static final String RELEASE_URL_FORMAT = Configuration.root()
.getString("application.update.releaseUrlFormat",
"https://github.com/naver/yobi/releases/tag/v%s");
"https://github.com/doortts/yona/releases/tag/v%s");

public static String versionToUpdate = null;

Expand Down
2 changes: 1 addition & 1 deletion app/utils/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public String checkOne() {

public static String getSiteName() {
return ObjectUtils.defaultIfNull(
play.Configuration.root().getString("application.siteName"), "Yobi");
play.Configuration.root().getString("application.siteName"), "Yona");
}

public static String getHostport(String defaultValue) {
Expand Down
6 changes: 4 additions & 2 deletions app/views/common/navbar.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
</div>
<header class="gnb-outer @if(project !=null) {project-header}">
<div class="gnb-inner">
<a href="@routes.Application.index()" class="logo"><h1 class="blind">@utils.Config.getSiteName</h1></a>
<ul class="gnb-nav">
<li>
<a href="@routes.Application.index()" class="logo logo-title">Y</a>
</li>
<li class="@isActiveMenu(MenuType.PROJECTS)">
<a href="@routes.ProjectApp.projects()">@Messages("title.projectList")</a>
</li>
Expand Down Expand Up @@ -113,4 +115,4 @@
</ul>
@common.usermenu(null)
</div>
</header>
</header>
2 changes: 1 addition & 1 deletion app/views/help/toc.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h3>@Messages("title.help")</h3>
<div class="answer-wrap">
<i class="yobicon-a a"></i>
<div class="answer" style="width:100%">
@Messages("app.name")를 설치하고자 하면 <a href="http://github.com/nforge/yobi#korean">http://github.com/nforge/yobi#korean</a>를 참고해 주세요.
@Messages("app.name")를 설치하고자 하면 <a href="https://github.com/doortts/yona#korean">https://github.com/doortts/yona#korean</a>를 참고해 주세요.
</div>
</div>
</li>
Expand Down
43 changes: 21 additions & 22 deletions app/views/index/index.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,34 @@
<div class="page-wrap">
<div class="site-guide-outer hide">
<h3>
<i class="yobicon-emo-wink"></i>
@Messages("app.welcome",utils.Config.getSiteName)
<span>@Messages("app.description")</span>
<span>@Messages("app.welcome",utils.Config.getSiteName) - @Messages("app.description")</span>
</h3>
<div class="site-guide-inner">
<ul class="guide-wrap row-fluid">
<li class="span4">
<h4>@Messages("app.welcome.project")</h4>
<p>@Messages("app.welcome.project.desc")</p>
<table class="welcome-table table borderless">
<tr>
<td>
<a href="@routes.ProjectApp.newProjectForm()" class="ybtn ybtn-success">
@Messages("button.newProject")
@Messages("button.newProject")
</a>
</li>
<li class="span4">
<h4>@Messages("app.welcome.group")</h4>
<p>@Messages("app.welcome.group.desc")</p>
</td>
<td>@Messages("app.welcome.project.desc")</td>
</tr>
<tr>
<td>
<a href="@routes.OrganizationApp.newForm()" class="ybtn ybtn-success">
@Messages("title.newOrganization")
@Messages("title.newOrganization")
</a>
</li>
<li class="span4">
<h4>@Messages("app.welcome.searchProject")</h4>
<p>@Messages("app.welcome.searchProject.desc")</p>
</td>
<td>@Messages("app.welcome.group.desc")</td>
</tr>
<tr>
<td>
<a href="@routes.ProjectApp.projects()" class="ybtn ybtn-success">
@Messages("title.projectList")
@Messages("title.projectList")
</a>
</li>
</ul>
</div>
</td>
<td>@Messages("app.welcome.searchProject.desc")</td>
</tr>
</table>
</div>
<div class="guide-toggle">
<button class="btn-transparent" id="toggleIntro"><i class="yobicon-resizev"></i></button>
Expand Down
45 changes: 23 additions & 22 deletions conf/application.conf.default
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# Site Name
# ~~~~~~~~~
# The name of your website
application.siteName="Yobi"
application.siteName="Yona"

# Anonymous access
# ~~~~~~~~~~~~~~~~
# This site allows anonymous access. (default: true)
# If this is false, Yobi refuses anonymous access to any page except for the
# If this is false, Yona refuses anonymous access to any page except for the
# ones to be needed for login, login and creating accout.
# NOTE: Even if this is false, anyone can create a account freely. If you don't
# want to allow that, set signup.require.confirm to false.
Expand Down Expand Up @@ -45,8 +45,8 @@ application.langs="en-US, ko-KR, ja-JP"
ebeanconfig.datasource.default=default
# H2 Configuration
db.default.driver=org.h2.Driver
# db.default.url="jdbc:h2:mem:yobi;MODE=PostgreSQL;DB_CLOSE_DELAY=-1"
db.default.url="jdbc:h2:file:./yobi;MODE=PostgreSQL;MV_STORE=FALSE;MVCC=FALSE;CACHE_SIZE=131072;AUTO_SERVER=TRUE"
# db.default.url="jdbc:h2:mem:yona;MODE=PostgreSQL;DB_CLOSE_DELAY=-1"
db.default.url="jdbc:h2:file:./yona;MODE=PostgreSQL;MV_STORE=FALSE;MVCC=FALSE;CACHE_SIZE=131072;AUTO_SERVER=TRUE"
# db.default.user=sa
# db.default.password=sa
db.default.logStatements=true
Expand All @@ -61,12 +61,12 @@ db.default.statementsCacheSize=1000

# MySQL Configuration
# db.default.driver=com.mysql.jdbc.Driver
# db.default.url="jdbc:mysql://127.0.0.1:3306/yobi?characterEncoding=utf-8"
# db.default.user=yobi
# db.default.url="jdbc:mysql://127.0.0.1:3306/yona?characterEncoding=utf-8"
# db.default.user=yona
# db.default.password=""

# Local
# db.default.url="jdbc:postgresql://localhost:5432/yobi"
# db.default.url="jdbc:postgresql://localhost:5432/yona"
# db.default.user=postgres
# db.default.password=password

Expand Down Expand Up @@ -102,7 +102,7 @@ application.scheme="http"
# application.port="8080"

# Application feedback url at top layout menu. You can remove feedback menu by commenting it.
application.feedback.url="https://github.com/naver/yobi/issues"
application.feedback.url="https://github.com/doortts/yona/issues"

# Mailer
# ~~~~~~
Expand All @@ -112,7 +112,7 @@ smtp.host = smtp.gmail.com
smtp.port = 465
smtp.ssl = true
#smtp.user = yourGmailId
smtp.user = yobiproject.mail
smtp.user = yona.mail
# Be careful!!!
smtp.password = yourGmailPassword
smtp.domain = gmail.com
Expand All @@ -130,10 +130,10 @@ smtp.archive.size = 5
#
# If you want to use this feature, your IMAP server has to be configured to
# support the address alias using '+' sign, also known as 'subaddressing' or
# 'detailed addressing'. For example, emails to 'yobi[email protected]' have
# to be delivered to 'yobi@yourmail.com'.
# 'detailed addressing'. For example, emails to 'yona[email protected]' have
# to be delivered to 'yona@yourmail.com'.
#
# SECURITY WARNING: Yobi believes the email address in From header of the
# SECURITY WARNING: Yona believes the email address in From header of the
# received email is truthful and use it for authentication without doubt. To
# avoid this problem, your imap server must deny every email whose From header
# is forged.
Expand All @@ -144,10 +144,10 @@ smtp.archive.size = 5
imap.use = false
imap.host = imap.googlemail.com
imap.ssl = true
imap.user = "your-yobi[email protected]"
# The email address of Yobi. Mailbox Service processes an email only if its
imap.user = "your-yona[email protected]"
# The email address of Yona. Mailbox Service processes an email only if its
# address is as follows.
imap.address = "your-yobi[email protected]"
imap.address = "your-yona[email protected]"
# Be careful!!!
imap.password = yourGmailPassword
imap.folder = inbox
Expand Down Expand Up @@ -184,13 +184,14 @@ application.notification.draft-time = 30s

# Software Update
# ~~~~~~~~~~~~~~~
# Check for updates of Yobi at this interval if it is grater than 0.
# Check for updates of Yona at this interval if it is grater than 0.
application.update.notification.interval = 1h
# A url to the git repository for Yobi releases.
application.update.repositoryUrl = "http://repo.yobi.io/naver/yobi"
# A format to construct the url to latest Yobi release. "%s" is a format
# specifier for Yobi version to download like "0.5.7".
application.update.releaesUrlFormat = "https://github.com/naver/yobi/releases/tag/v%s"
# A url to the git repository for Yona releases.
application.update.check.use = true
application.update.repositoryUrl = "http://repo.yona.io/yona/yona"
# A format to construct the url to latest Yona release. "%s" is a format
# specifier for Yona version to download like "0.5.7".
application.update.releaesUrlFormat = "https://github.com/doortts/yona/releases/tag/v%s"

# customize play default thread pool size
# see: https://www.playframework.com/documentation/2.3.x/ThreadPools
Expand Down Expand Up @@ -231,5 +232,5 @@ akka {
}
}

# No referrer information is to be leaked when following the link from yobi pages. If you don't want, set it false
# No referrer information is to be leaked when following the link from yona pages. If you don't want, set it false
application.noreferrer = true
Loading

0 comments on commit 9684b12

Please sign in to comment.