Merge pull request #642 from fabianofranz/master

Couple fixes

.openshift/README.md

@@ -0,0 +1,3 @@
+For information about .openshift directory, consult the documentation:
+
+http://openshift.github.io/documentation/oo_user_guide.html#the-openshift-directory

.openshift/action_hooks/README.md

@@ -0,0 +1,3 @@
+For information about action hooks, consult the documentation:
+
+http://openshift.github.io/documentation/oo_user_guide.html#action-hooks

.openshift/action_hooks/build

@@ -1,11 +1,22 @@
 #!/bin/bash
 cd $OPENSHIFT_REPO_DIR
 
+rm -rf $OPENSHIFT_REPO_DIR/node
+rm -rf $OPENSHIFT_REPO_DIR/node_modules
+rm -rf $OPENSHIFT_TMP_DIR/npm
+rm -rf $OPENSHIFT_TMP_DIR/npmrc
+rm -rf $OPENSHIFT_TMP_DIR/m2
+rm -rf $OPENSHIFT_TMP_DIR/local
+
+export NPM_CONFIG_PREFIX="$OPENSHIFT_TMP_DIR/npm"
+export NPM_CONFIG_USERCONFIG="$OPENSHIFT_TMP_DIR/npmrc"
 export NPM_CONFIG_CACHE="$OPENSHIFT_TMP_DIR/npm/cache" 
 export MAVEN_OPTS="-Dmaven.repo.local=$OPENSHIFT_TMP_DIR/m2" 
 export HOME="$OPENSHIFT_TMP_DIR/local" 
 
+export NPM_CONFIG_ARCH="x64"
+
 npm install npm
 export PATH="$OPENSHIFT_REPO_DIR/node_modules/.bin:$PATH"
 
-mvn clean package
+mvn clean package -DskipTests -Dos.arch=x64

.openshift/action_hooks/stop

@@ -1,8 +1,8 @@
 #!/bin/bash
 source $OPENSHIFT_CARTRIDGE_SDK_BASH
-if [ -z "$(ps -ef | grep commafeed | grep -v grep)" ]
+if [ -z "$(ps -ef | grep commafeed.jar | grep -v grep)" ]
 then
     client_result "Application is already stopped"
 else
-    kill `ps -ef | grep commafeed | grep -v grep | awk '{ print $2 }'` > /dev/null 2>&1
+    kill `ps -ef | grep commafeed.jar | grep -v grep | awk '{ print $2 }'` > /dev/null 2>&1
 fi

.openshift/markers/README.md

@@ -0,0 +1,3 @@
+For information about markers, consult the documentation:
+
+http://openshift.github.io/documentation/oo_user_guide.html#markers

README.md

@@ -94,4 +94,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

pom.xml

@@ -323,4 +323,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>

src/main/app/js/directives.js

@@ -193,7 +193,7 @@ module.directive('category', [function() {
 						});
 						var label = '';
 						if (count > 0) {
-							label = '(' + count + ')';
+							label += count;
 						}
 						return label;
 					};
@@ -201,7 +201,7 @@ module.directive('category', [function() {
 					$scope.feedCountLabel = function(feed) {
 						var label = '';
 						if (feed.unread > 0) {
-							label = '(' + feed.unread + ')';
+							label += feed.unread; 
 						}
 						return label;
 					};
@@ -358,4 +358,4 @@ module.directive('metricGauge', function() {
 		restrict : 'E',
 		templateUrl : 'templates/_metrics.gauge.html'
 	};
-});
+});

src/main/app/sass/components/_subscription-list.scss

@@ -101,6 +101,14 @@
 	font-size: 11px;
 }
 
+.css-treeview .unread ~ .unread-counter::before {
+	content: '(';
+}
+
+.css-treeview .unread ~ .unread-counter::after {
+	content: ')';
+}
+
 .css-treeview a {
 	cursor: pointer;
 	color: black;