diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss
index b4146080f137112ff3660f93001d36ae896747a7..4ab2de6263297822e822f4736f93b86987ed88d5 100644
--- a/scss/ionic.app.scss
+++ b/scss/ionic.app.scss
@@ -2550,7 +2550,10 @@ div[dropzone]:hover {
pointer-events: none;
}
-/* -- feed (home page) -- */
+/**********
+ feed (home page)
+**********/
+
.feed {
.card {
background-color: rgba(0,0,0,0.3);
@@ -2565,13 +2568,16 @@ div[dropzone]:hover {
list-style: unset;
padding-left: 40px;
}
+ a {
+ color: inherit;
+ }
.feed_header,
.card .header {
height: 25px;
color: grey !important;
- a {
- color: inherit;
+ a:hover {
+ color: $positive !important;
}
.avatar {
margin-top: -6px;
@@ -2599,6 +2605,11 @@ div[dropzone]:hover {
text-align: start;
color: lightgrey !important;
}
-
+ .feed-footer,
+ .card .footer {
+ a:hover {
+ color: $positive !important;
+ }
+ }
}
diff --git a/www/feed.json b/www/feed.json
index 9c71e6821d986a33f24f1db9cdc5fdf7f698ad69..91288145e1b4daa1953ab7bfeaf28b76d93ba300 100644
--- a/www/feed.json
+++ b/www/feed.json
@@ -8,7 +8,7 @@
"author": {
"name": "Benoit Lavenier",
"url": "@BenoitLavenier",
- "avatar": "http://localhost:9200/user/profile/38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE/_image/avatar.png"
+ "avatar": "https://g1.data.duniter.fr/user/profile/38MEAZN68Pz1DTvT3tqgxx4yQP6snJCQhPqEFxbDk4aE/_image/avatar.png"
},
"items": [
{
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index f0e6a97cc99389bd9fbc6a3d4e09c02d4281dbab..aca8492f6ae5073cb9dfe260200bbe5d1bb2c186 100644
--- a/www/js/controllers/app-controllers.js
+++ b/www/js/controllers/app-controllers.js
@@ -606,6 +606,7 @@ function HomeController($scope, $state, $timeout, $ionicHistory, $translate, $ht
return res.concat(item);
}, []);
+
$scope.feed = feed;
})
.error(function(data, status) {
diff --git a/www/plugins/es/templates/common/edit_socials.html b/www/plugins/es/templates/common/edit_socials.html
index e6ffd374624cc97768d18fe3353bd36ef716f9d3..128e17f6aabed4a626d97d1634272b02e9c08f11 100644
--- a/www/plugins/es/templates/common/edit_socials.html
+++ b/www/plugins/es/templates/common/edit_socials.html
@@ -1,9 +1,9 @@
-<ion-list class="no-padding">
+<div class="list no-padding {{::motion.ionListClass}}">
<!-- divider -->
<div class="item item-divider">
- <span>
- {{'PROFILE.SOCIAL_NETWORKS_DIVIDER' | translate}}
- </span>
+
+ <span translate>PROFILE.SOCIAL_NETWORKS_DIVIDER</span>
+
<a class="badge button button-text button-small button-small-padding"
ng-class="{'button-text-positive': socialData.reorder}"
ng-if="formData.socials && formData.socials.length > 1"
@@ -11,11 +11,11 @@
<span translate>PROFILE.BTN_REORDER</span>
</a>
</div>
-</ion-list>
+</div>
<ion-list show-reorder="socialData.reorder">
- <ion-item class="item-remove-animate item-icon-left item-social-edit"
+ <ion-item class="item-icon-left item-social-edit done in"
type="no-padding item-text-wrap"
ng-if="formData.socials && formData.socials.length"
ng-repeat="social in formData.socials | filter:filterFn track by social.url"
@@ -63,9 +63,8 @@
on-return="addSocialNetwork($event);"
ng-model="socialData.url"/>
</label>
- <button class="button button-small hidden-xs" type="button" ng-click="addSocialNetwork($event)">
- {{'COMMON.BTN_ADD'|translate}}
- </button>
+ <button class="button button-small hidden-xs" type="button" ng-click="addSocialNetwork($event)"
+ translate>COMMON.BTN_ADD</button>
<button class="button button-small button-icon icon ion-android-add visible-xs" type="button"
ng-click="addSocialNetwork($event)">
</button>
diff --git a/www/plugins/es/templates/user/edit_profile.html b/www/plugins/es/templates/user/edit_profile.html
index 98162d8f7c826cfb9cc14a337a338e59279f7cae..1c5e26ee52d9c69498bdcf422148a4b5c44dbdbc 100644
--- a/www/plugins/es/templates/user/edit_profile.html
+++ b/www/plugins/es/templates/user/edit_profile.html
@@ -63,11 +63,7 @@
<form name="profileForm" novalidate="" ng-submit="saveAndClose()">
- <div class="list item-text-wrap {{::motion.ionListClass}}"
- ng-init="setForm(profileForm)">
-
-
-
+ <div class="list item-text-wrap {{::motion.ionListClass}}" ng-init="setForm(profileForm)">
<!-- Public info -->
<div class="item item-icon-left item-text-wrap">
@@ -75,9 +71,7 @@
<h4 class="positive" translate>PROFILE.HELP.WARNING_PUBLIC_DATA</h4>
</div>
- <div class="item item-divider">
- {{'PROFILE.GENERAL_DIVIDER' | translate}}
- </div>
+ <div class="item item-divider" translate>PROFILE.GENERAL_DIVIDER</div>
<!-- title -->
<ion-item class="item-input item-floating-label item-button-right"
@@ -121,9 +115,7 @@
<div class="list item-text-wrap {{::motion.ionListClass}}">
- <div class="item item-divider">
- {{'PROFILE.TECHNICAL_DIVIDER' | translate}}
- </div>
+ <div class="item item-divider" translate>PROFILE.TECHNICAL_DIVIDER</div>
<!-- uid -->
<ion-item class="item-icon-left" ng-if="walletData && walletData.uid">
diff --git a/www/templates/home/home.html b/www/templates/home/home.html
index 946ed0ff6320cbb11c1bb3d293dff4baba60b319..85811da2f683e96a6aacd3ec39669ff0ab19cb0d 100644
--- a/www/templates/home/home.html
+++ b/www/templates/home/home.html
@@ -43,7 +43,7 @@
</div>
</div>
- <div class="center animate-fade-in animate-show-hide ng-hide" ng-show="!loading && !error">
+ <div class="center animate-show-hide ng-hide" ng-show="!loading && !error">
<!-- Help tour (NOT ready yet for small device) -->
<button type="button"
@@ -125,38 +125,42 @@
</h3>
<!-- feed items -->
- <div ng-repeat="item in feed.items"
- class="card padding">
-
- <div class="header ">
- <!-- author -->
- <i ng-if="item.author.avatar" class="avatar" style="background-image: url({{item.author.avatar}});"></i>
- <a ng-class="{'avatar-left-padding': item.author.avatar}" class="author"
- ng-click="item.author.url && openLink($event, item.author.url)">
- {{item.author.name}}
- </a>
-
- <!-- time -->
- <a ng-if="item.time"
- title="{{item.time|formatDate}}"
- ng-click="openLink($event, item.url)"
- class="item-note">
- <small><i class="icon ion-clock"></i> {{item.time|formatFromNow}}</small>
- </a>
+ <div class="animate-show-hide ng-hide" ng-show="feed">
+ <div ng-repeat="item in feed.items"
+ class="card padding ">
+
+ <div class="header ">
+ <!-- author -->
+ <i ng-if="item.author.avatar" class="avatar" style="background-image: url({{item.author.avatar}});"></i>
+ <a ng-class="{'avatar-left-padding': item.author.avatar}" class="author"
+ ng-click="item.author.url && openLink($event, item.author.url)">
+ {{item.author.name}}
+ </a>
+
+ <!-- time -->
+ <a ng-if="item.time"
+ title="{{item.time|formatDate}}"
+ ng-click="openLink($event, item.url)"
+ class="item-note ">
+ <small><i class="icon ion-clock"></i> {{item.time|formatFromNow}}</small>
+ </a>
+ </div>
+ <!-- title -->
+ <h2 class="title feed-title">
+ <a ng-click="openLink($event, item.url)">{{item.title}}</a></h2>
+ <div ng-if="item.content"
+ class="content feed-content"
+ trust-as-html="item.content"></div>
+
+ <!-- footer -->
+ <h4 class="card-footer feed-footer text-right positive-100">
+ <a ng-click="openLink($event, item.url)">
+ <span ng-if="item.truncated" translate>HOME.READ_MORE</span>
+ <span ng-if="!item.truncated" translate>COMMON.BTN_SHOW</span>
+ <i class="icon ion-chevron-right"></i>
+ </a>
+ </h4>
</div>
- <!-- title -->
- <h2 class="title feed-title">
- <a ng-click="openLink($event, item.url)">{{item.title}}</a></h2>
- <div ng-if="item.content"
- class="content feed-content"
- trust-as-html="item.content"></div>
- <h4 class="card-footer feed-footer text-right positive-100">
- <a ng-click="openLink($event, item.url)">
- <span ng-if="item.truncated" translate>HOME.READ_MORE</span>
- <span ng-if="!item.truncated" translate>COMMON.BTN_SHOW</span>
- <i class="icon ion-chevron-right"></i>
- </a>
- </h4>
</div>
</div>
</div>