Merge branch 'nccu_ie' of https://github.com/Rulingcom/NCCU into nccu_ie

app/views/admin/assets/file_upload.html.erb

@@ -59,4 +59,4 @@
     </div>
 
 <% end %>
-</body>
+</body>

app/views/admin/sites/sitemap_frontend.html.erb

@@ -16,7 +16,7 @@
   $(document).ready(function(){
     $('.site-map').masonry({
       itemSelector: '.map-block',
-      columnWidth: 260,
+      columnWidth: 220,
       isAnimated: true
     });
   });

app/views/layouts/page_layout.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
-<html>
+<html class="<%= I18n.locale.to_s %>">
 <head>
 <meta charset="utf-8">
 	<%= page_title(@item).html_safe %>
@@ -12,6 +12,17 @@
 	<%= page_javascripts(@item).html_safe %>
 </head>
 <body>
-	<%= yield %>
+  <%= yield %>
+  <% if !flash.empty? %>
+    <div class="modal alert alert-error hide" id="myModal">
+      <p type="button" class="close" data-dismiss="modal">×</p>
+      <% flash.each do |key, msg| %>
+          <%= "<strong>#{msg}</strong><br/>".html_safe%>
+      <% end%>
+    </div>
+    <script>
+      $('#myModal').modal('show')
+    </script>
+  <% end -%>
 </body>
 </html>

app/views/shared/render_share.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+	<meta property="og:title" content="<%= @object.title %>" /> 
+	<meta property="og:description" content="<%= strip_tags @object.subtitle %>" /> 
+	<meta property="og:image" content="<%= ('http://' + request.env['HTTP_HOST'] + @object.image.url) unless @object.image.blank? %>" />
+	<script type="text/javascript">
+		<!--
+		window.location = "<%= @orig_url %>"
+		//-->
+	</script>
+</head>
+<body>
+</body>
+</html>