Skip to content

The Unified and Autonomous Development Platform

More css adjusts

Robin Shen724b35badc33
diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java
index e08c45ca77..196b45ee84 100644
--- a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java
+++ b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java
@@ -17,6 +17,7 @@ import org.apache.wicket.request.http.WebRequest;
import com.turbodev.server.web.component.tabbable.Tab;
import com.turbodev.server.web.component.tabbable.Tabbable;
+import com.turbodev.server.web.util.WicketUtils;
@SuppressWarnings("serial")
public abstract class SidebarPanel extends Panel {
@@ -43,8 +44,12 @@ public abstract class SidebarPanel extends Panel {
WebRequest request = (WebRequest) RequestCycle.get().getRequest();
Cookie miniCookie = request.getCookie(miniCookieKey);
- if (miniCookie != null && "yes".equals(miniCookie.getValue()))
+ if (miniCookie != null) {
+ if ("yes".equals(miniCookie.getValue()))
+ add(AttributeAppender.append("class", "minimized"));
+ } else if (WicketUtils.isDevice()) {
add(AttributeAppender.append("class", "minimized"));
+ }
}
protected Component newHead(String componentId) {
diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css b/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css
index a3d5675f20..5561309a0a 100644
--- a/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css
+++ b/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css
@@ -60,6 +60,7 @@
color: #888;
font-weight: bold;
margin-right: 1px;
+ background: #FAFAFA;
}
.minimizable.sidebar>a.mini-toggle .text {
margin-left: 8px;
diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java
index 7d1b2ad3be..e71eb31999 100644
--- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java
@@ -37,7 +37,7 @@ public abstract class AdministrationPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- add(new SidebarPanel("sidebar", null) {
+ add(new SidebarPanel("sidebar", "administration.miniSidebar") {
@Override
protected List<? extends Tab> newTabs() {
diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java b/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java
index fa4bf355f1..518fbbabd0 100644
--- a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java
@@ -44,7 +44,7 @@ public abstract class GroupPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- add(new SidebarPanel("sidebar", null) {
+ add(new SidebarPanel("sidebar", "group.miniSidebar") {
@Override
protected List<? extends Tab> newTabs() {
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index 9bf126d71c..3bd07e1892 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -99,6 +99,7 @@ import com.turbodev.server.web.page.project.blob.search.SearchMenuContributor;
import com.turbodev.server.web.page.project.commit.CommitDetailPage;
import com.turbodev.server.web.page.project.compare.RevisionComparePage;
import com.turbodev.server.web.util.DateUtils;
+import com.turbodev.server.web.util.WicketUtils;
import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener;
import com.turbodev.server.web.websocket.PageDataChanged;
import com.turbodev.utils.Range;
@@ -746,7 +747,11 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
if (hasOutline()) {
WebRequest request = (WebRequest) RequestCycle.get().getRequest();
Cookie cookie = request.getCookie(COOKIE_OUTLINE);
- return cookie != null && "yes".equals(cookie.getValue());
+ if (cookie != null) {
+ return cookie.getValue().equals("yes");
+ } else {
+ return !WicketUtils.isDevice();
+ }
} else {
return false;
}
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.html b/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.html
index 4686880dcd..f9086e7c60 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.html
+++ b/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label"></span></a>
+ <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label" class="text"></span></a>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css b/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css
index ca642ebda7..6d6f13c845 100644
--- a/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css
+++ b/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css
@@ -2,6 +2,8 @@
left: 240px;
background: white;
border-left: none;
+ position: absolute;
+ z-index: 205;
}
#project-setting>.sidebar>.tabs>li>a {
border-left: none;
diff --git a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html
index 8096cf00e0..0d39599505 100644
--- a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html
+++ b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html
@@ -1,5 +1,6 @@
<wicket:extend>
<div class="avatar-edit">
+ <img wicket:id="avatar"></img>
<form wicket:id="form">
<div wicket:id="feedback"></div>
<div class="clearfix">
diff --git a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java
index 819b13dc97..4e29996fbd 100644
--- a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java
@@ -13,6 +13,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.turbodev.utils.FileUtils;
import com.turbodev.server.TurboDev;
import com.turbodev.server.security.SecurityUtils;
+import com.turbodev.server.web.component.avatar.Avatar;
import com.turbodev.server.web.component.avatar.AvatarChanged;
import com.turbodev.server.web.util.avatar.AvatarManager;
@@ -31,6 +32,8 @@ public class AvatarEditPage extends UserPage {
protected void onInitialize() {
super.onInitialize();
+ add(new Avatar("avatar", getUser()));
+
Form<?> form = new Form<Void>("form");
add(form);
form.add(new NotificationPanel("feedback", form));
diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java b/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java
index 5210f22490..d855563979 100644
--- a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java
+++ b/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java
@@ -46,7 +46,7 @@ public abstract class UserPage extends LayoutPage {
protected void onInitialize() {
super.onInitialize();
- add(new SidebarPanel("sidebar", null) {
+ add(new SidebarPanel("sidebar", "user.miniSidebar") {
@Override
protected Component newHead(String componentId) {
diff --git a/web/src/main/java/com/turbodev/server/web/page/user/user.css b/web/src/main/java/com/turbodev/server/web/page/user/user.css
index 6ca3219db8..18d0c01dec 100644
--- a/web/src/main/java/com/turbodev/server/web/page/user/user.css
+++ b/web/src/main/java/com/turbodev/server/web/page/user/user.css
@@ -2,16 +2,27 @@
text-align: center;
vertical-align: center;
border-bottom: 2px solid #E0E0E0;
- padding: 8px;
+ padding: 10px;
}
#user>.sidebar>.tabs {
- top: 180px;
+ top: 240px;
}
#user>.sidebar>.head img {
- height: 160px;
- width: 160px;
+ height: 220px;
+ width: 220px;
+}
+#user>.minimized.sidebar>.head {
+ display: none;
+}
+#user>.minimized.sidebar>.tabs {
+ top: 0;
}
+#user .avatar-edit img.avatar {
+ height: 240px;
+ width: 240px;
+ margin-bottom: 20px;
+}
#user .avatar-edit .upload {
margin-right: 8px;
}
diff --git a/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java b/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java
index 769e951849..1ea4da52fc 100644
--- a/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java
+++ b/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java
@@ -1,6 +1,7 @@
package com.turbodev.server.web.util;
import javax.annotation.Nullable;
+import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -44,6 +45,15 @@ public class WicketUtils {
return null;
}
+ public static boolean isDevice() {
+ HttpServletRequest request = (HttpServletRequest) RequestCycle.get().getRequest().getContainerRequest();
+ String userAgent = request.getHeader("User-Agent").toLowerCase();
+ return userAgent.indexOf("android") != -1
+ || userAgent.indexOf("iphone") != -1
+ || userAgent.indexOf("ipad") != -1
+ || userAgent.indexOf("windows phone") != -1;
+ }
+
public static void markLastVisibleChild(WebMarkupContainer container) {
Component lastVisible = null;
for (Component child: container) {