Merge pull request #16 from friedger/master

add title and some meta data, fixes #13, see #12
gdg-x · Sep 29, 2014 · 99173f9 · 99173f9
2 parents 6c0c5e4 + 6e292e7
commit 99173f9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -19,7 +19,8 @@
     "lodash": "~2.4.1",
     "moment": ">=2.8.3",
     "moment-timezone": ">=0.2.2",
-    "angular-linkify": ">=0.3.0"
+    "angular-linkify": ">=0.3.0",
+    "angularjs-viewhead":">=0.0.1"
   },
   "devDependencies": {
     "angular-mocks": ">=1.2.*",

diff --git a/client/app/app.js b/client/app/app.js
@@ -9,7 +9,8 @@ angular.module('fireflyApp', [
   'googlechart',
   'google-maps',
   'ngGeolocation',
-  'linkify'
+  'linkify',
+  'viewhead'
 ])
   .config(function ($routeProvider, $locationProvider) {
     $routeProvider

diff --git a/client/app/main/main.html b/client/app/main/main.html
@@ -35,6 +35,10 @@ <h3>Upcoming Events</h3>
 	</div>
 	<div ng-switch-default>
 		<div class="container" ng-show="tag">
+            <meta view-head property="og:type" content="website">
+            <meta view-head property="og:description" content="{{tag.description}}">
+            <meta view-head property="og:title" content="{{tag.title}}">
+            <view-title>{{tag.title}}</view-title>
 			<div class="row">
 				<div class="col-md-12">
 					<div class="card card-map">

diff --git a/client/app/shorturl/shorturl.event.html b/client/app/shorturl/shorturl.event.html
@@ -1,11 +1,13 @@
+<meta view-head property="og:type" content="article">
+<meta view-head property="og:description" content="{{event.about}}">
+<meta view-head property="og:title" content="{{event.title}}">
 <div ng-include="'components/navbar/navbar.html'"></div>
-
 <div class="container">
     <div class="row">
         <div class="col-md-9">
             <div class="row">
                 <div class="col-md-12">
-                    <h3>{{event.title}} <small><time-ago date="event.start"></time-ago></small></h3>
+                    <h3 view-title>{{event.title}} <small><time-ago date="event.start"></time-ago></small></h3>
                     <div class="card">
                         <div class="card-body">
                             <p>

diff --git a/client/index.html b/client/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
-<!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7" ng-app="fireflyApp"> <![endif]-->
+<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8" ng-app="fireflyApp"> <![endif]-->
+<!--[if IE 8]>         <html class="no-js lt-ie9" ng-app="fireflyApp"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" ng-app="fireflyApp"> <!--<![endif]-->
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <base href="/">
-    <title></title>
+    <title ng-bind="viewTitle ? viewTitle : 'GDG events'">GDG events</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
@@ -27,7 +27,7 @@
       <!-- endinjector -->
     <!-- endbuild -->
   </head>
-  <body ng-app="fireflyApp">
+  <body>
     <!--[if lt IE 7]>
       <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->
@@ -69,6 +69,7 @@
       <script src="bower_components/moment/moment.js"></script>
       <script src="bower_components/moment-timezone/builds/moment-timezone-with-data-2010-2020.js"></script>
       <script src="bower_components/angular-linkify/angular-linkify.js"></script>
+      <script src="bower_components/angularjs-viewhead/angularjs-viewhead.js"></script>
       <!-- endbower -->
     <!-- endbuild -->