Skip to content

Commit 04f3912

Browse files
author
svuillet
committed
change search box ui
1 parent 73b776f commit 04f3912

File tree

6 files changed

+9
-22
lines changed

6 files changed

+9
-22
lines changed

mobile-war/src/main/java/org/silverpeas/mobile/client/components/base/NavigationMenu.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ public class NavigationMenu extends Composite implements PageEventHandler {
8787
@UiField TextBox search;
8888
@UiField AvatarUpload avatar;
8989

90-
@UiField
91-
AnchorElement searchButton;
92-
9390
@UiField(provided = true) protected ApplicationMessages msg = null;
9491

9592
@UiField UnorderedList listApplications;
@@ -128,8 +125,8 @@ public NavigationMenu() {
128125
iconUserCalendar.setInnerHTML(resources.usercalendar().getText());
129126
iconInbox.setInnerHTML(resources.inbox().getText());
130127
iconShareBox.setInnerHTML(resources.sharebox().getText());
131-
searchButton.setInnerHTML(resources.search().getText());
132128
EventBus.getInstance().addHandler(AbstractPageEvent.TYPE, this);
129+
search.getElement().setAttribute("placeholder", msg.search());
133130
}
134131

135132
public void setPersonalApps(List<ApplicationInstanceDTO> applicationInstanceDTOS) {
@@ -206,11 +203,6 @@ protected void search(KeyDownEvent event) {
206203
}
207204
}
208205

209-
/*@UiHandler("searchButton")
210-
protected void searchIos(ClickEvent event) {
211-
SpMobil.search(search.getText());
212-
}*/
213-
214206
@UiHandler("home")
215207
protected void goHome(ClickEvent event) {
216208
goHome();

mobile-war/src/main/java/org/silverpeas/mobile/client/components/base/NavigationMenu.ui.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
<div id="menu-search">
4141
<g:TextBox ui:field="search" styleName="searchBox"/>
42-
<a ui:field="searchButton" class="searchButton"></a>
4342
</div>
4443

4544
<ul id="navmenu-panel">

mobile-war/src/main/java/org/silverpeas/mobile/client/resources/ApplicationMessages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public interface ApplicationMessages extends Messages {
7878
@DefaultMessage("Discussions")
7979
SafeHtml tchat();
8080

81-
@DefaultMessage("Go")
81+
@DefaultMessage("Rechercher")
8282
String search();
8383

8484
@DefaultMessage("Retour")

mobile-war/src/main/java/org/silverpeas/mobile/client/resources/ApplicationMessages_en.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ok=OK
4242

4343
home=Home
4444
tchat=Messaging
45-
search=Go
45+
search=Search
4646
back=Back
4747
usercalendar= Calendar
4848

mobile-war/src/main/java/org/silverpeas/mobile/client/resources/ApplicationMessages_fr.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ok=OK
4343

4444
home=Accueil
4545
tchat=Discussions
46-
search=Go
46+
search=Rechercher
4747
usercalendar=Agenda
4848

4949
back=Retour

mobile-war/src/main/java/org/silverpeas/mobile/public/spmobile.css

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,25 +1909,21 @@ textarea.ui-input-text {
19091909
.searchBox {
19101910
border: 1px solid #d3d3d3;
19111911
border-radius: 3px;
1912-
width:calc( 100% - 4em );
1913-
background-color: var(--white);
1912+
width:calc( 100% - 1em );
19141913
color: #666;
19151914
padding: 5px;
19161915
outline-style: none;
19171916
height: 1.5em;
1918-
}
1919-
1920-
.searchButton svg {
1921-
width: 2em;
1922-
height: 2em;
1923-
display: inline-block;
1924-
position: absolute;
1917+
background-color: var(--white);
19251918
}
19261919

19271920
#menu-search {
19281921
background: #efefef;
19291922
padding: 1em;
1923+
padding-left: 2em;
1924+
margin-left: 0.5em;
19301925
border-top: 1px solid #d3d3d3;
1926+
background: 0px 1.5em url('icons/search.svg') no-repeat;
19311927
}
19321928

19331929
.bloc-actu-vignette, .bloc-actu-content {

0 commit comments

Comments
 (0)