This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/templates/mustache/whitelabel/post/dodo/partials/author.html b/templates/mustache/whitelabel/post/dodo/partials/author.html | |
index 6bdca09..fa121f3 100644 | |
--- a/templates/mustache/whitelabel/post/dodo/partials/author.html | |
+++ b/templates/mustache/whitelabel/post/dodo/partials/author.html | |
@@ -3,6 +3,6 @@ | |
{{#original_user_subsite.logo}}<img src="{{original_user_subsite.logo}}" class="author-photo" nopin = "nopin" />{{/original_user_subsite.logo}} | |
<span class="author-name">By <a href="{{original_user_subsite.get_url_or_domain_url}}">{{original_user_subsite.title}}</a></span> | |
<div class="post-date">{{formated_full_created_ts}}</div> | |
- <div class="fb-like" data-href="{{post_url}}" data-layout="button_count" data-action="like" data-show-faces="true" data-share="false" data-kid-directed-site="false"></div> | |
+ <div class="fb-like" data-href="https://www.facebook.com/thedodosite" data-layout="button_count" data-action="like" data-show-faces="true" data-share="false" data-kid-directed-si |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/community/shortcodes/adapters/__init__.py b/community/shortcodes/adapters/__init__.py | |
index a2a25cb..ca1dbe9 100644 | |
--- a/community/shortcodes/adapters/__init__.py | |
+++ b/community/shortcodes/adapters/__init__.py | |
@@ -473,8 +473,28 @@ class IframeAdapter(BaseAdapter): | |
brief_text = 'iframe' | |
html_param_prefix = '' | |
+ def _get_url(self): | |
+ parts = urlparse(self.iden) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/community/views/components/data.py b/community/views/components/data.py | |
index 86ce37a..79d7205 100644 | |
--- a/community/views/components/data.py | |
+++ b/community/views/components/data.py | |
@@ -241,6 +241,7 @@ class SiteInfo(object): | |
if ctx.request.engine.name != 'rebelmouse': | |
data['whitelabel_settings'] = ctx.request.engine.settings | |
+ data['FB_APP_ID'] = ctx.request.engine.get_consumer_keys('facebook')[0] | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git diff rm/models/mongo/__init__.py | |
diff --cc rm/models/mongo/__init__.py | |
index f2ff376,48eb469..0000000 | |
--- a/rm/models/mongo/__init__.py | |
+++ b/rm/models/mongo/__init__.py | |
@@@ -279,15 -323,13 +322,23 @@@ class MongoModel(object) | |
@classmethod | |
def pack_fields(cls, query): | |
++<<<<<<< HEAD |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --cc rebelmouse/settings.py | |
index f5245ec,fef6f58..0000000 | |
--- a/rebelmouse/settings.py | |
+++ b/rebelmouse/settings.py | |
@@@ -401,8 -396,7 +401,12 @@@ REDIS = | |
# 'master_host': 'redis-prod-master:6379', | |
# 'slave_host': 'redis-prod-slave:6379', | |
#}, | |
++<<<<<<< HEAD | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91066949 (Veronica Lotti 2014-09-10 15:38:19 +0000 31) <div class="facebook-widget"> | |
3c2f336a (Dasha Kubayeva 2014-09-10 21:06:35 +0000 32) <div class="btn-fb-like"><span>Like us on Facebook</span><iframe src="//www.facebook.com/plugins/like.php?href= | |
91066949 (Veronica Lotti 2014-09-10 15:38:19 +0000 33) </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* | |
* WEIGHT WATCHERS | |
*/ | |
/*= Header / topbar */ | |
.topbar { | |
-webkit-box-sizing: border-box; | |
-moz-box-sizing: border-box; | |
box-sizing: border-box; | |
background-color: rgb(255, 255, 255); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/templates/dynamic_content/weightwatchers/find-a-meeting.xml | |
+++ b/templates/dynamic_content/weightwatchers/find-a-meeting.xml | |
@@ -1,10 +1,11 @@ | |
<?xml version="1.0" encoding="UTF-8" ?> | |
-<div class="body-pretender what-can-i-eat"> | |
+<div class="body-pretender find-a-meeting"> | |
+ <script_header src="//ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&s=1"/> | |
<include template="community/roar/includes/weightwatchers/header.html"/> | |
<div class="main"> | |
<include template="community/roar/includes/weightwatchers/menu.html"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<footer class="ftr"> | |
<div class="ftr-wrp"> | |
<div class="links"> | |
<ul data-title="OUR COMPANY" class="active"> | |
<li><a href="/section/who-we-are/">Who We Are</a></li> | |
<li><a href="/section/press-release/">Press</a></li> | |
<li><a href="/section/work/">In The Workplace</a></li> | |
<li><a href="/section/advertise/">Advertise</a></li> | |
<li><a href="http://www.weightwatchers.com/job/index.aspx">Careers</a></li> | |
<li><a href="/section/affiliate/">Affiliate Program</a></li> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<div class="column text-center medium-9 medium-centered"> | |
<p class="xxxs"> | |
WEIGHT WATCHERS and PointsPlus are the registered trademarks of Weight Watchers International, Inc. Trademarks used under license by WeightWatchers.com, Inc. © 2014 Weight Watchers International, Inc. © 2014 WeightWatchers.com, Inc. All rights reserved. | |
</p> | |
<div class="small-4 column small-centered"> | |
<img src="img/truste.png" alt=""><br><br> | |
</div> | |
</div> |
OlderNewer