Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: grigio/opentalk
base: 7293ce1652
...
head fork: grigio/opentalk
compare: b8c0cd83cf
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 07, 2012
@grigio FIX page title 6399c1c
Commits on Mar 08, 2012
@grigio FIX cookie 564f836
Commits on Mar 21, 2012
@grigio + meta description b8c0cd8
View
13 app/views/layouts/application.html.erb
@@ -4,8 +4,6 @@ cookies.permanent[:c] = params[:c] if params[:c]
<% content_for :head do %>
<meta http-equiv="Refresh" content="1; url=<%= Configs.site_url %>" >
<% end if params[:c] %>
-<% content_for :body do %>
- onLoad="javascript:pageTracker._setVar('<%= cookies[:c].slice(0..10) %>');"<% end if params[:c] || cookies[:c] %>
<!DOCTYPE html>
<html lang="it">
@@ -48,14 +46,9 @@ cookies.permanent[:c] = params[:c] if params[:c]
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-2kk71kk7-13'.replace('kk','6').replace('kk','6') ]);
+ _gaq.push(['_setCustomVar', 1, '<%= cookies[:c] || 'nc' %>', 'v-<%= cookies[:c] || 'nc' %>',2]);
_gaq.push(['_trackPageview']);
- _gaq.push(['_setCustomVar',
- 1, // This custom var is set to slot #1. Required parameter.
- '<%= cookies[:c].slice(0..10) || '' %>', // The name of the custom variable. Required parameter.
- 'v-<%= cookies[:c].slice(0..10) || '' %>', // The value of the custom variable. Required parameter.
- // (possible values might be Free, Bronze, Gold, and Platinum)
- 1 // Sets the scope to visitor-level. Optional parameter.
- ]);
+ _gaq.push(['_trackPageLoadTime']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
@@ -67,7 +60,7 @@ cookies.permanent[:c] = params[:c] if params[:c]
</head>
- <body <%= yield :body %>>
+ <body>
<!-- HEADER
================================================== -->
View
8 app/views/talks/show.html.erb
@@ -1,6 +1,14 @@
+
<%#= template_include_tag 'vote_box' %>
<% talk = @talk %>
+<% content_for :head do %>
+<!-- from view -->
+<meta name="og:title" content="<%= sanitize talk.title %>">
+<meta name="og:description" content="<%= sanitize talk.content.gsub(/\r\n?|<[a-z]*>|<[a-z]*\/>/, ' ') %>">
+
+<% end %>
+
<% if can? :update, talk %>
<div class="row">
<div class="span12">

No commit comments for this range

Something went wrong with that request. Please try again.