Theme: Default: add Social button

ivywe · Dec 31, 2015 · d2e8c37 · d2e8c37
1 parent 5d1a766
commit d2e8c37
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 30 deletions.
diff --git a/public_html/layout/default/archivestorytext.thtml b/public_html/layout/default/archivestorytext.thtml
@@ -1,19 +1,26 @@
 {# begin {templatelocation} #}
 
 <article itemscope itemtype="http://schema.org/Article" class="<?php if(SEC_inGroup('Root')){ ?>gl-edit <?php } ?>uk-article archivestorytext">
+
   <header>
-    <h1 itemprop="name" class="uk-article-title">{story_title_link}</h1>
 
-    <div class="uk-subnav uk-flex-right">
-      {email_icon}{print_icon}{edit_icon}
+    <h1 itemprop="name" class="uk-article-title uk-margin-remove">{story_title_link}</h1>
+
+    <div class="uk-grid">
+    	<div class="uk-width-1-2">
+    		<ul class="uk-article-meta uk-subnav uk-flex-left">
+			    <li itemprop="datePublished">{story_date}</li>
+			    <li>{lang_contributed_by} {start_contributedby_anchortag}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{contributedby_author}</span></span>{end_contributedby_anchortag}</li>
+			    <li>{lang_views} {story_hits}</li>
+    		</ul>
+	    </div>
+		<div class="uk-width-1-2">
+		    <div class="uk-subnav uk-flex-right">
+		    	{email_icon}{print_icon}{edit_icon}
+		    </div>
+	    </div>
     </div>
 
-    <ul class="uk-flex uk-flex-left">
-      <li itemprop="datePublished">{story_date}</li>
-      <li>{lang_contributed_by} {start_contributedby_anchortag}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{contributedby_author}</span></span>{end_contributedby_anchortag}</li>
-      <li>{lang_views} {story_hits}</li>
-    </ul>
-
   </header>
 
   <div itemprop="articleBody">

diff --git a/public_html/layout/default/css_ltr/theme.css b/public_html/layout/default/css_ltr/theme.css
@@ -4,3 +4,4 @@
  background:#efefef !important;
 }
 
+.uk-form-row + .uk-form-row {margin-top: 8px;}
diff --git a/public_html/layout/default/featuredstorytext.thtml b/public_html/layout/default/featuredstorytext.thtml
@@ -2,18 +2,30 @@
 
 <article itemscope itemtype="http://schema.org/Article" class="<?php if(SEC_inGroup('Root')){ ?>gl-edit <?php } ?>uk-article featuredstorytext">
   <header>
-    <div class="uk-subnav uk-flex-right">
-      {email_icon}{print_icon}{edit_icon}
-    </div>
-
-    <h1 itemprop="name" class="uk-article-title">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h1>
 
-    <ul class="uk-article-meta uk-subnav uk-flex-left">
-      <li itemprop="datePublished">{story_date}</li>
-      <li>{lang_contributed_by} {start_contributedby_anchortag}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{contributedby_author}</span></span>{end_contributedby_anchortag}</li>
-      <li>{lang_views} {story_hits}</li>
+    <ul class="uk-subnav uk-flex-right uk-margin-remove">
+      <li><g:plusone href="{site_url}/article.php/{story_id}"></g:plusone></li>
+      <li><a class="twitter-share-button" data-url="{site_url}/article.php/{story_id}" href="https://twitter.com/intent/tweet?text={story_title}" data-lang="ja">Tweet</a></li>
+      <li><iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2F{!!autotag domain: !!}%2Farticle.php%2F{story_id}&amp;width=150&amp;height=20&amp;colorscheme=light&amp;layout=button_count&amp;action=like&amp;show_faces=true&amp;send=true&amp;appId={!!autotag conf:facebook_consumer_key !!}" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:150px; height:20px;" allowTransparency="true"></iframe></li>
     </ul>
 
+    <h1 itemprop="name" class="uk-article-title uk-margin-remove">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h1>
+
+    <div class="uk-grid">
+    	<div class="uk-width-1-2">
+    		<ul class="uk-article-meta uk-subnav uk-flex-left">
+			    <li itemprop="datePublished">{story_date}</li>
+			    <li>{lang_contributed_by} {start_contributedby_anchortag}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{contributedby_author}</span></span>{end_contributedby_anchortag}</li>
+			    <li>{lang_views} {story_hits}</li>
+    		</ul>
+	    </div>
+		<div class="uk-width-1-2">
+		    <div class="uk-subnav uk-flex-right">
+		    	{email_icon}{print_icon}{edit_icon}
+		    </div>
+	    </div>
+    </div>
+
   </header>
 
   <div itemprop="articleBody">

diff --git a/public_html/layout/default/header.thtml b/public_html/layout/default/header.thtml
@@ -13,6 +13,11 @@
 
 <!-- <meta http-equiv="Pragma" content="no-cache"{xhtml}> -->
 <link rel="start contents" href="{site_url}"{xhtml}>
+
+<meta name="twitter:image:height" content="400"{xhtml}>
+<meta name="twitter:image:width" content="500"{xhtml}>
+<meta name="twitter:url" content="<?php echo COM_getCurrentURL(); ?>"{xhtml}>
+
 {feed_url}
 {rel_links}
 {plg_headercode}

diff --git a/public_html/layout/default/loginform.thtml b/public_html/layout/default/loginform.thtml
@@ -20,10 +20,11 @@
 
         <div class="uk-form-row uk-text-small">
 				<ul class="uk-subnav uk-flex-center">
-					{!if lang_signup}<li class="uk-button uk-text-left" style="min-width:11em"><i class="uk-icon-plus-circle"></i> {lang_signup}</li>{!endif}
-                	{!if lang_forgetpassword}<li class="uk-button uk-text-left" style="min-width:11em"><i class="uk-icon-exclamation-triangle"></i> {lang_forgetpassword}</li>{!endif}
+					{!if lang_signup}<li class="uk-button uk-text-left" style="min-width:11em; padding-left:0.5em"><i class="uk-icon-plus-circle"></i> {lang_signup}</li>{!endif}
+                	{!if lang_forgetpassword}<li class="uk-button uk-text-left" style="min-width:11em; padding-left:0.5em"><i class="uk-icon-exclamation-triangle"></i> {lang_forgetpassword}</li>{!endif}
 				</ul>
         </div>
+
     </fieldset>
 </form>
 

diff --git a/public_html/layout/default/loginform_openid.thtml b/public_html/layout/default/loginform_openid.thtml
@@ -1,6 +1,7 @@
 {# begin {templatelocation} #}
 
-<form class="uk-form uk-form-horizontal" action="{site_url}/users.php?openid_login=1" method="post">
+<li>
+<form class="uk-form" action="{site_url}/users.php?openid_login=1" method="post" style="min-width:2em">
     <div style="display: none;">
         <div class="uk-form-row">
             <!-- this is revealed by login.js -->
@@ -20,5 +21,6 @@
         </div>
     </noscript>
 </form>
+</li>
 
 {# end {templatelocation} #}
diff --git a/public_html/layout/default/storytext.thtml b/public_html/layout/default/storytext.thtml
@@ -2,18 +2,30 @@
 
 <article itemscope itemtype="http://schema.org/Article" class="<?php if(SEC_inGroup('Root')){ ?>gl-edit <?php } ?>uk-article">
   <header>
-    <div class="uk-subnav uk-flex-right">
-      {email_icon}{print_icon}{edit_icon}
-    </div>
-
-    <h1 itemprop="name" class="uk-article-title">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h1>
 
-    <ul class="uk-article-meta uk-subnav uk-flex-left">
-      <li itemprop="datePublished">{story_date}</li>
-      <li>{lang_contributed_by} {start_contributedby_anchortag}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{contributedby_author}</span></span>{end_contributedby_anchortag}</li>
-      <li>{lang_views} {story_hits}</li>
+    <ul class="uk-subnav uk-flex-right uk-margin-remove">
+      <li><g:plusone href="{site_url}/article.php/{story_id}"></g:plusone></li>
+      <li><a class="twitter-share-button" data-url="{site_url}/article.php/{story_id}" href="https://twitter.com/intent/tweet?text={story_title}" data-lang="ja">Tweet</a></li>
+      <li><iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2F{!!autotag domain: !!}%2Farticle.php%2F{story_id}&amp;width=150&amp;height=20&amp;colorscheme=light&amp;layout=button_count&amp;action=like&amp;show_faces=true&amp;send=true&amp;appId={!!autotag conf:facebook_consumer_key !!}" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:150px; height:20px;" allowTransparency="true"></iframe></li>
     </ul>
 
+    <h1 itemprop="name" class="uk-article-title uk-margin-remove">{start_storylink_anchortag}{story_title}{end_storylink_anchortag}</h1>
+
+    <div class="uk-grid">
+    	<div class="uk-width-1-2">
+    		<ul class="uk-article-meta uk-subnav uk-flex-left">
+			    <li itemprop="datePublished">{story_date}</li>
+			    <li>{lang_contributed_by} {start_contributedby_anchortag}<span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{contributedby_author}</span></span>{end_contributedby_anchortag}</li>
+			    <li>{lang_views} {story_hits}</li>
+    		</ul>
+	    </div>
+		<div class="uk-width-1-2">
+		    <div class="uk-subnav uk-flex-right">
+		    	{email_icon}{print_icon}{edit_icon}
+		    </div>
+	    </div>
+    </div>
+
   </header>
 
   <div itemprop="articleBody">