Merge pull request #74 from ArcBees/ol_last_fixes

Quelques petits fixs (CSS et AppEngine)
ArcBees · May 14, 2016 · eaf9d18 · eaf9d18
2 parents cefcf7b + 8a92099
commit eaf9d18
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
  <arcbees-ui.version>1.3-SNAPSHOT</arcbees-ui.version>
 
  <!-- server -->
- <gae.version>1.9.19</gae.version>
+ <gae.version>1.9.36</gae.version>
  <guice.version>3.0</guice.version>
  <arcbees.version>1.1.1</arcbees.version>
  <resteasy.version>3.0.11.Final</resteasy.version>

diff --git a/src/main/java/com/arcbees/bourseje/client/RemoteModule.java b/src/main/java/com/arcbees/bourseje/client/RemoteModule.java
@@ -22,6 +22,6 @@
 public class RemoteModule extends AbstractPresenterModule {
  @Override
  protected void configure() {
- bindConstant().annotatedWith(RestApplicationPath.class).to("http://bourseje.arcbees.com/api");
+ bindConstant().annotatedWith(RestApplicationPath.class).to("//bourseje.arcbees.com/api");
  }
 }
diff --git a/...ain/java/com/arcbees/bourseje/client/application/identification/IdentificationView.ui.xml b/...ain/java/com/arcbees/bourseje/client/application/identification/IdentificationView.ui.xml
@@ -23,7 +23,7 @@
 
  <input ui:field="code" type="password" max="5"/>
  <button class="{res.styles.btn} {res.styles.btn_wide}" type="submit">
- Unique moi? Toujours!
+ Allons au vote!
  </button>
  </form>
  </div>

diff --git a/src/main/java/com/arcbees/bourseje/server/upload/CloudStorageUploadService.java b/src/main/java/com/arcbees/bourseje/server/upload/CloudStorageUploadService.java
@@ -35,7 +35,7 @@
 
 public class CloudStorageUploadService implements ImageUploadService {
  private static final String[] IMAGE_FILE_EXTENSIONS = new String[]{"jpg", "png", "gif", "jpeg"};
- private static final String BUCKET_NAME = "imagesBucket";
+ private static final String BUCKET_NAME = "jccqbourseje.appspot.com";
  private static final int BUFFER_SIZE = 2 * 1024 * 1024;
 
  private final GcsService gcsService = GcsServiceFactory.createGcsService(new RetryParams.Builder()
@@ -47,9 +47,7 @@ public class CloudStorageUploadService implements ImageUploadService {
  @Override
  public String upload(String name, InputStream inputStream, long size) {
  GcsOutputChannel outputChannel;
- GcsFileOptions options = new GcsFileOptions.Builder()
- .acl("public-read")
- .build();
+ GcsFileOptions options = GcsFileOptions.getDefaultInstance();
  GcsFilename fileName = getFileName(name);
 
  verifyFileExtension(name);

diff --git a/src/main/resources/com/arcbees/bourseje/client/resources/css/pages/confirmvote.gss b/src/main/resources/com/arcbees/bourseje/client/resources/css/pages/confirmvote.gss
@@ -27,6 +27,7 @@
 .choice_finalist_name {
  font-family: F_SECONDARY;
  font-size: 22px;
+ display: block;
 }
 
 .choice_finalist_company {

diff --git a/src/main/resources/com/arcbees/bourseje/client/resources/css/pages/home.gss b/src/main/resources/com/arcbees/bourseje/client/resources/css/pages/home.gss
@@ -1,5 +1,5 @@
 .home_main_content {
- height: calc(100% - 80px);
+ height: calc(100% - 75px);
 }
 
 .vote {

diff --git a/src/main/resources/com/arcbees/bourseje/client/resources/css/styles.gss b/src/main/resources/com/arcbees/bourseje/client/resources/css/styles.gss
@@ -88,7 +88,7 @@ input {
 }
 
 .main_content .wrapper {
- width: 260px;
+ width: 290px;
 }
 
 .main_content > article,
@@ -199,6 +199,7 @@ input {
  content: "\0020";
  display: block;
  height: 0;
+
  overflow: hidden;
 }
 
@@ -224,7 +225,7 @@ input {
 
  cursor: pointer;
  display: inline-block;
- margin: 25px 0 50px;
+ margin: 15px 0 50px;
  height: 35px;
  padding: .5em 1.5rem;
  outline: 0;
@@ -271,6 +272,7 @@ input {
 
 .text_step {
  text-align: center;
+
  margin-bottom: 20px;
 }
 
@@ -300,7 +302,9 @@ a.jccq:hover {
 
 footer {
  background-color: #000;
- padding: 15px 0;
+
+ height: 75px;
+ padding-top: 8px;
 }
 
 .logoArcbees {