c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

improve display of channel

Browse Source
This commit is contained in:
Lee Lawlor
2014-08-05 14:44:39 -04:00
parent 868882a0c9
commit 6d2d9f2b17
15 changed files with 149 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/channels/_channelinfo.html.erb
View File

@ -1,13 +1,17 @@
<div id="channel_info" class="FL channelInfo" >
<div class="FL" ><h3 class="channel_info"><%= @channel.name %></h3></div>
<div class="FR list_tags"><%= @channel.list_tags %></div>
<div class="CB"></div>
<div class="col-xs-6 col-sm-6">
<h3><%= @channel.name %></h3>
<% if @channel.user.present? %>
<p>by <%= link_to @channel.user.login, user_profile_path(@channel.user.login) %></p>
<div>by <%= link_to @channel.user.login, user_profile_path(@channel.user.login) %></div><br>
<% end %>
<div class="channelDescription" ><p><%= @channel.description %></p></div>
<p></p>
</div> <!-- end channelInfo -->
<div><%= @channel.description %></div><br>
<div>
<b>Tags:</b>
<% @channel.tags.each do |tag| %>
<a href="/channels/public?tag=<%=u tag.name %>"><%= tag.name %></a><% unless tag == @channel.tags.last %>, <% end %>
<% end %>
</div><br>
</div>
<div id="channellinks">
<div class="FR developerlink">
<a id="devInfoLink_<%= zone %>" href="#" class="topLink" ><%= t(:developer_info) %></a>

6
app/views/channels/_edit.html.erb
View File

@ -103,7 +103,7 @@
</tr>
<tr>
<td class="left"></td>
<td><%= c.submit t(:channel_update) %></td>
<td><%= c.submit t(:channel_update), class: 'btn btn-primary' %></td>
</tr>
</table>
<% end %>
@ -111,12 +111,12 @@
<br><br>
<h4><%= t(:channel_clear_message) %></h4>
<%= button_to t(:channel_clear), "/channels/#{@channel.id}/clear", :data => { :confirm => t(:confirm_channel_clear) } %>
<%= button_to t(:channel_clear), "/channels/#{@channel.id}/clear", :data => { :confirm => t(:confirm_channel_clear) }, class: 'btn btn-danger' %>
<br><br>
<h4><%= t(:channel_delete_message) %></h4>
<%= button_to t(:channel_delete), channel_path(@channel.id), :method => 'delete', :data => { :confirm => t(:confirm_channel_delete) } %>
<%= button_to t(:channel_delete), channel_path(@channel.id), :method => 'delete', :data => { :confirm => t(:confirm_channel_delete) }, class: 'btn btn-danger' %>
</div>
<div id="sidebar_old">
<ul>

4
app/views/channels/_import.html.erb
View File

@ -9,7 +9,7 @@
<%= t(:time_zone) %>
<%= time_zone_select 'feed', 'time_zone', nil, :default => 'UTC' %>
<br><br>
<%= f.submit t(:upload), data: { disable_with: t(:uploading) } %>
<%= f.submit t(:upload), data: { disable_with: t(:uploading) }, class: 'btn btn-primary' %>
<% end %>
<br><br>
@ -17,7 +17,7 @@
<h3><%= t(:export) %></h3>
<%= t(:download_feeds) %>
<br><br>
<%= button_to t(:download), "#{@ssl_api_domain}stream/channels/#{@channel.id}/feeds?api_key=#{@channel.write_api_key}" %>
<%= button_to t(:download), "#{@ssl_api_domain}stream/channels/#{@channel.id}/feeds?api_key=#{@channel.write_api_key}", class: 'btn btn-primary' %>
</div>
<div id="sidebar_old" >

16
app/views/channels/_private_show.html.erb
View File

@ -1,15 +1,21 @@
<%= render :partial => 'channelinfo', :locals => { :zone => "private" } %>
<div class="channel_stats_location">
<span class="channel_stats_text">Channel Stats</span>
<div class="col-xs-6 col-sm-6" style="padding-left: 42px;">
<h4 style="color: #333;">Channel Stats</h4>
<table>
<tr><td>Created</td><td ><abbr class="timeago channel_time_text" title="<%= @channel.created_at %>" ><%= @channel.created_at %></abbr></td></tr>
<tr><td>Updated</td><td ><abbr class="timeago channel_time_text" title="<%= @channel.updated_at %>" ><%= @channel.updated_at %></abbr></td></tr>
</table>
<span><%= @channel.feeds.count %> Entries</span>
</div>
<div class="CB" >
<div id="private_dialog0" class="column" > </div>
<div id="private_dialog1" class="column" > </div>
<div class="CB">
<div class="col-xs-6 col-sm-6">
<div id="private_dialog0" class="column"></div>
</div>
<div class="col-xs-6 col-sm-6">
<div id="private_dialog1" class="column"></div>
</div>
</div>
<script>
// when the document is ready

10
app/views/channels/_public_show.html.erb
View File

@ -3,8 +3,12 @@
<%= render :partial => 'channelinfo', :locals => { :zone => "public" } %>
<div class="CB">
<div id="public_dialog0" class="column" > </div>
<div id="public_dialog1" class="column" > </div>
<div class="col-xs-6 col-sm-6">
<div id="public_dialog0" class="column"></div>
</div>
<div class="col-xs-6 col-sm-6">
<div id="public_dialog1" class="column"></div>
</div>
</div>
<div class="commentlink" >
@ -74,7 +78,7 @@ function commentflag(m_id, user_id)
</script>
<% else %>
<div class="FL" >
<h3 class="channel_info"><%= t(:channel_not_public) %></h3>
<h3><%= t(:channel_not_public) %></h3>
</div>
<% end %>

6
app/views/channels/private_show.html.erb
View File

@ -12,7 +12,7 @@
<%= render :partial => "socialbuttons" %>
<div id="maincontent" >
<div id="maincontent_nowidth" class="col-xs-12 col-sm-12">
<ul>
<li><a href="#privateview"><%= t("private_view") %></a></li>
<li><a href="#publicview"><%= t("public_view") %></a></li>
@ -95,7 +95,7 @@ $(document).on('page:load ready', function() {
else {
$("#watchText").text("Watch");
}
$("#maincontent").tabs({
$("#maincontent_nowidth").tabs({
select: function( e, ui) {
$.cookie('stickyTab', ui.index );
},
@ -111,7 +111,7 @@ $(document).on('page:load ready', function() {
}
if( ! isNaN( stickyTab ) )
{
$("#maincontent").tabs( 'select', stickyTab );
$("#maincontent_nowidth").tabs( 'select', stickyTab );
}
var current_user = "<%= @mychannel %>";

8
app/views/channels/public_show.html.erb
View File

@ -11,7 +11,7 @@
<%= render :partial=>"socialbuttons" %>
<div id="maincontent">
<div id="maincontent_nowidth" class="col-xs-12 col-sm-12">
<ul>
<li><a href="#publicview">Public View</a></li>
</ul>
@ -47,7 +47,7 @@ $(document).on('page:load ready', function() {
position: {
my: 'top',
at: 'top',
of: $('#maincontent')
of: $('#maincontent_nowidth')
},
title: "Developer Info",
dialogClass: "dev-info-dialog"
@ -62,7 +62,7 @@ $(document).on('page:load ready', function() {
$("#watchText").text("Watch");
}
$("#maincontent").tabs( {
$("#maincontent_nowidth").tabs( {
select: function( e, ui)
{
$.cookie('stickyTab', ui.index );
@ -74,7 +74,7 @@ $(document).on('page:load ready', function() {
if( ! isNaN( stickyTab ) )
{
$("#maincontent").tabs( 'select', stickyTab );
$("#maincontent_nowidth").tabs( 'select', stickyTab );
}
var current_user = "<%= @mychannel %>" ;