diff --git a/Gemfile b/Gemfile index 1a3a097a..8fa2d077 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'remotipart' group :assets do gem 'sass-rails', '~> 3.2.3' gem 'coffee-rails', '~> 3.2.1' - + gem 'bourbon' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'execjs' gem 'eco' diff --git a/Gemfile.lock b/Gemfile.lock index 6772c5dd..a8f3639e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,6 +47,8 @@ GEM nokogiri (<= 1.5.0) uuidtools (~> 2.1) bcrypt-ruby (3.0.1) + bourbon (1.4.0) + sass (>= 3.1) builder (3.0.0) bushido (0.0.36) highline (>= 1.6.1) @@ -228,6 +230,7 @@ PLATFORMS DEPENDENCIES aws-sdk + bourbon bushido capybara coffee-rails (~> 3.2.1) diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee index 8152fdf6..5be84ecc 100644 --- a/app/assets/javascripts/backbone/kandan.js.coffee +++ b/app/assets/javascripts/backbone/kandan.js.coffee @@ -22,7 +22,7 @@ window.Kandan = chat_area = new Kandan.Views.ChatArea({channels: channels}) create_channel = new Kandan.Views.CreateChannel() - $(".create_channel").html create_channel.render().el + # $(".create_channel").html create_channel.render().el # TODO move broadcast subscription to a helper # TODO change this to use the broadcaster from the settings @@ -46,9 +46,9 @@ window.Kandan = Kandan.Plugins.init_all() - $(".container").html(chat_area.render().el) + $(".main-area").html(chat_area.render().el) chatbox = new Kandan.Views.Chatbox() - $(".container").append(chatbox.render().el) + $(".main-area").append(chatbox.render().el) $('#channels').tabs({select: (event, ui)-> $(document).data('active_channel_id', Kandan.Helpers.Channels.get_channel_id_from_tab_index(ui.index)) diff --git a/app/assets/javascripts/backbone/plugins/attachments.js.coffee b/app/assets/javascripts/backbone/plugins/attachments.js.coffee index 372b334c..165c1056 100644 --- a/app/assets/javascripts/backbone/plugins/attachments.js.coffee +++ b/app/assets/javascripts/backbone/plugins/attachments.js.coffee @@ -1,7 +1,6 @@ class Kandan.Plugins.Attachments - @widget_title: "Attachments" - @widget_name: "attachments" + @widget_title: "Media" @plugin_namespace: "Kandan.Plugins.Attachments" @template: _.template(''' @@ -48,9 +47,9 @@ class Kandan.Plugins.Attachments @init: ()-> - Kandan.Widgets.register @widget_name, @plugin_namespace + Kandan.Widgets.register @plugin_namespace Kandan.Data.Channels.register_callback "change", ()=> - Kandan.Widgets.render(@widget_name) + Kandan.Widgets.render @plugin_namespace Kandan.Plugins.register "Kandan.Plugins.Attachments" \ No newline at end of file diff --git a/app/assets/javascripts/backbone/plugins/music_player.js.coffee b/app/assets/javascripts/backbone/plugins/music_player.js.coffee index 47eb52df..0a48b0fa 100644 --- a/app/assets/javascripts/backbone/plugins/music_player.js.coffee +++ b/app/assets/javascripts/backbone/plugins/music_player.js.coffee @@ -2,7 +2,7 @@ class Kandan.Plugins.MusicPlayer @plugin_namespace: "Kandan.Plugins.MusicPlayer" @plugin_id: "" - @widget_name: "music_player" + @widget_title: "Player" @play_regex: /^\/play .+/ @stop_regex: /^\/stop/ @local_song_data: false @@ -49,7 +49,7 @@ class Kandan.Plugins.MusicPlayer @register_widget: ()-> - Kandan.Widgets.register @widget_name, @plugin_namespace + Kandan.Widgets.register @plugin_namespace @register_modifier: ()-> @@ -72,7 +72,7 @@ class Kandan.Plugins.MusicPlayer Kandan.Store.set @plugin_id, { success: (data)-> @local_song_data = data - Kandan.Widgets.render_widget @widget_name + Kandan.Widgets.render_widget @plugin_namespace } }) diff --git a/app/assets/javascripts/backbone/plugins/user_list.js.coffee b/app/assets/javascripts/backbone/plugins/user_list.js.coffee index fc607c64..fa7dc084 100644 --- a/app/assets/javascripts/backbone/plugins/user_list.js.coffee +++ b/app/assets/javascripts/backbone/plugins/user_list.js.coffee @@ -1,7 +1,8 @@ class Kandan.Plugins.UserList - @widget_title: "Users" + @widget_title: "People" @widget_name: "users" + @plugin_namespace: "Kandan.Plugins.UserList" @render: ($el)-> $users = $("") @@ -12,8 +13,8 @@ class Kandan.Plugins.UserList @init: ()-> - Kandan.Widgets.register(@widget_name, "Kandan.Plugins.UserList") + Kandan.Widgets.register @plugin_namespace Kandan.Data.ActiveUsers.register_callback "change", ()=> - Kandan.Widgets.render(@widget_name) + Kandan.Widgets.render @plugin_namespace Kandan.Plugins.register "Kandan.Plugins.UserList" \ No newline at end of file diff --git a/app/assets/javascripts/backbone/routers/main_router.js.coffee b/app/assets/javascripts/backbone/routers/main_router.js.coffee index d08c2361..9079be04 100644 --- a/app/assets/javascripts/backbone/routers/main_router.js.coffee +++ b/app/assets/javascripts/backbone/routers/main_router.js.coffee @@ -5,5 +5,5 @@ class Kandan.Routers.Main extends Backbone.Router index: ()-> view = new Kandan.Views.ChatArea() - $('.container').html(view.render().el) + $('.main-area').html(view.render().el) $('.channels').tabs() diff --git a/app/assets/javascripts/backbone/widgets.js.coffee b/app/assets/javascripts/backbone/widgets.js.coffee index 2754dfd4..f88c89fb 100644 --- a/app/assets/javascripts/backbone/widgets.js.coffee +++ b/app/assets/javascripts/backbone/widgets.js.coffee @@ -1,26 +1,32 @@ class Kandan.Widgets @widgets: {} - @register: (widget_name, callback)-> - @widgets[widget_name] = callback + @register: (widget_namespace)-> + @widgets[widget_namespace] = "widget_#{Object.size(@widgets)}" @all: ()-> @widgets - @widget_names: ()-> - widget_names = [] - for widget_name of @all() - widget_names.push(widget_name) if @all().hasOwnProperty(widget_name) - widget_names - @init_all: ()-> - @init(widget_name) for widget_name in @widget_names() + $.each @widgets, (widget_namespace, el_name)=> + @init(widget_namespace) + + @template: _.template ''' +
+
<%= title %>
+
+
+ ''' + + @init: (widget_namespace)-> + widget = eval(widget_namespace) + $(".sidebar .widgets").append(@template({ + element_id: @widgets[widget_namespace], + title: widget.widget_title + })) + @render(widget_namespace) - @init: (widget_name)-> - # TODO use the widget_name property on the plugin module to get the title - $(".sidebar").append("

#{widget_name}

") - @render(widget_name) - @render: (widget_name)-> - $widget_el = $(".sidebar .#{widget_name}") - eval(@widgets[widget_name]).render($widget_el) if $widget_el != [] + @render: (widget_namespace)-> + $widget_el = $("##{@widgets[widget_namespace]}") + eval(widget_namespace).render($widget_el) if $widget_el != [] diff --git a/app/assets/javascripts/lib/object.js.coffee b/app/assets/javascripts/lib/object.js.coffee new file mode 100644 index 00000000..69ece0d3 --- /dev/null +++ b/app/assets/javascripts/lib/object.js.coffee @@ -0,0 +1,5 @@ +Object.size = (obj)-> + size = 0 + for key of obj + size++ if (obj.hasOwnProperty(key)) + return size; diff --git a/app/assets/stylesheets/.sass-cache/17f0e82b2579360f0fd2da22dc8536465246e07f/application.css.scssc b/app/assets/stylesheets/.sass-cache/17f0e82b2579360f0fd2da22dc8536465246e07f/application.css.scssc new file mode 100644 index 00000000..9af60a1a Binary files /dev/null and b/app/assets/stylesheets/.sass-cache/17f0e82b2579360f0fd2da22dc8536465246e07f/application.css.scssc differ diff --git a/app/assets/stylesheets/.sass-cache/17f0e82b2579360f0fd2da22dc8536465246e07f/application.scssc b/app/assets/stylesheets/.sass-cache/17f0e82b2579360f0fd2da22dc8536465246e07f/application.scssc new file mode 100644 index 00000000..19799f94 Binary files /dev/null and b/app/assets/stylesheets/.sass-cache/17f0e82b2579360f0fd2da22dc8536465246e07f/application.scssc differ diff --git a/app/assets/stylesheets/.sass-cache/4430bcd5702170ba130be06cca10fb0a768ae0cf/normalize.scssc b/app/assets/stylesheets/.sass-cache/4430bcd5702170ba130be06cca10fb0a768ae0cf/normalize.scssc new file mode 100644 index 00000000..e4a79303 Binary files /dev/null and b/app/assets/stylesheets/.sass-cache/4430bcd5702170ba130be06cca10fb0a768ae0cf/normalize.scssc differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 934d033d..00000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require_self - *= require_tree . -*/ - -.container {width: 80%; float: left} -.sidebar {width: 20%; float: right} \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.css b/app/assets/stylesheets/application.css.css new file mode 100644 index 00000000..e69de29b diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss new file mode 100644 index 00000000..f793c9a7 --- /dev/null +++ b/app/assets/stylesheets/application.css.scss @@ -0,0 +1,206 @@ +@import "lib/normalize"; +@import "bourbon"; + +$main-area-width: 80%; +$page-bg: #E6EBEE; +$panel-bg: $page-bg; + +$sidebar-width: 20%; +$sidebar-bg: #E6EBEE; + +$header-height: 30px; +$header-bg-1: #566569; +$header-bg-2: #3F494B; +$search-bg: #5D676B; + +$widget-title-color: #7F8587; +$widget-title-bg-1: #F3F8F9; +$widget-title-bg-2: #DBDFE0; + + + +@mixin full-height { + min-height: 100%; + height: 100%; +} + +* { + @include box-sizing(border-box); +} + +html { + @include full-height; +} + +body { + background: $page-bg; + height: 90%; + min-height: 90%; +} + + +.main-area { + @include full-height; + width: $main-area-width; + float: left; +} + +.sidebar { + @include full-height; + background: $sidebar-bg; + width: $sidebar-width; + float: left; + position: fixed; + right: 0px; + + .header { + padding-top: 3px; + padding-bottom: 3px; + width: 100%; + float: left; + height: $header-height; + @include background-image(linear-gradient($header-bg-1, $header-bg-2)); + + .search { + width: 50%; + float: left; + text-align: right; + + input { + width: 100%; + background: $search-bg; + border: 2px solid darken($search-bg, 10%); + // @include box-shadow(inset -5px -5px -5px #505A5D); + @include border-radius(20px); + } + + } + .logo { + text-align: right; + float: left; + width: 50%; + } + } + + .widgets { + float: left; + width: 100%; + padding-left: 15px; + padding-right: 15px; + + .widget { + margin-top: 20px; + border: 1px solid #D0D5D8; + @include border-radius(4px); + background: #F3F8F9; + + .title { + @include background-image(linear-gradient($widget-title-bg-1, $widget-title-bg-2)); + @include border-top-left-radius(4px); + @include border-top-right-radius(4px); + + padding-left: 10px; + padding-top: 5px; + padding-bottom: 5px; + + font-size: 13px; + text-transform: uppercase; + color: $widget-title-color; + } + + .content { + background: #F3F8F9; + } + } + } +} + +.chatbox-area { + @include background-image(linear-gradient($widget-title-bg-1, $widget-title-bg-2)); + margin-top: 0px 10px 0px 10px; + padding: 10px 20px 15px 20px; + position: fixed; + bottom: 20px; + width: $main-area-width; + + textarea { + @include border-top-left-radius(4px); + @include border-bottom-left-radius(4px); + border: 1px solid #AEB9BD; + width: 92.75%; + padding: 0px; + margin: 0px; + resize: none; + height: 40px; + } + + button { + position: relative; + left: -10px; + @include background-image(linear-gradient(#C8ECF6, #9FDFF4)); + @include border-top-right-radius(4px); + @include border-bottom-right-radius(4px); + border: 1px solid #AEB9BD; + color: #59808B; + width: 7%; + padding: 0px; + margin: 0px; + height: 40px; + } +} + +#channels { + +} + +.ui-widget-header { + @include background-image(linear-gradient($header-bg-1, $header-bg-2)); + @include border-radius(0px); + height: $header-height; + border: none; +} + +.ui-tabs { + padding: 0px; + @include border-radius(0px); + border: none; + + .ui-tabs-panel { + @include border-top-radius(4px); + margin-top: $header-height + 10; + margin-right: 20px; + margin-left: 20px; + background: #FFF; + } + + .ui-widget-content { + height: 90%; + min-height: 90%; + margin-bottom: 200px; + overflow-y: scroll; + } + + .ui-tabs-nav + { + position: fixed; + width: 80%; + top: 0px; + li a { + padding: 3px; + } + } +} + +.ui-corner-all .ui-corner-bottom, .ui-corner-bottom, .ui-corner-left, .ui-corner-right, .ui-corner-bl, .ui-corner-br { + @include border-radius(none); +} + +.ui-state-default { + font-size: 14px; +} + + +.ui-widget-content { + @include full-height; + background: $panel-bg; +} diff --git a/app/assets/stylesheets/lib/normalize.scss b/app/assets/stylesheets/lib/normalize.scss new file mode 100644 index 00000000..4474dee2 --- /dev/null +++ b/app/assets/stylesheets/lib/normalize.scss @@ -0,0 +1,504 @@ +/*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */ + +/* ============================================================================= + HTML5 display definitions + ========================================================================== */ + +/* + * Corrects block display not defined in IE6/7/8/9 & FF3 + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section, +summary { + display: block; +} + +/* + * Corrects inline-block display not defined in IE6/7/8/9 & FF3 + */ + +audio, +canvas, +video { + display: inline-block; + *display: inline; + *zoom: 1; +} + +/* + * Prevents modern browsers from displaying 'audio' without controls + * Remove excess height in iOS5 devices + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/* + * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4 + * Known issue: no IE6 support + */ + +[hidden] { + display: none; +} + + +/* ============================================================================= + Base + ========================================================================== */ + +/* + * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units + * http://clagnut.com/blog/348/#c790 + * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom + * www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ + */ + +html { + font-size: 100%; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ + -ms-text-size-adjust: 100%; /* 2 */ +} + +/* + * Addresses font-family inconsistency between 'textarea' and other form elements. + */ + +html, +button, +input, +select, +textarea { + font-family: sans-serif; +} + +/* + * Addresses margins handled incorrectly in IE6/7 + */ + +body { + margin: 0; +} + + +/* ============================================================================= + Links + ========================================================================== */ + +/* + * Addresses outline displayed oddly in Chrome + */ + +a:focus { + outline: thin dotted; +} + +/* + * Improves readability when focused and also mouse hovered in all browsers + * people.opera.com/patrickl/experiments/keyboard/test + */ + +a:hover, +a:active { + outline: 0; +} + + +/* ============================================================================= + Typography + ========================================================================== */ + +/* + * Addresses font sizes and margins set differently in IE6/7 + * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5 + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +h2 { + font-size: 1.5em; + margin: 0.83em 0; +} + +h3 { + font-size: 1.17em; + margin: 1em 0; +} + +h4 { + font-size: 1em; + margin: 1.33em 0; +} + +h5 { + font-size: 0.83em; + margin: 1.67em 0; +} + +h6 { + font-size: 0.75em; + margin: 2.33em 0; +} + +/* + * Addresses styling not present in IE7/8/9, S5, Chrome + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/* + * Addresses style set to 'bolder' in FF3+, S4/5, Chrome +*/ + +b, +strong { + font-weight: bold; +} + +blockquote { + margin: 1em 40px; +} + +/* + * Addresses styling not present in S5, Chrome + */ + +dfn { + font-style: italic; +} + +/* + * Addresses styling not present in IE6/7/8/9 + */ + +mark { + background: #ff0; + color: #000; +} + +/* + * Addresses margins set differently in IE6/7 + */ + +p, +pre { + margin: 1em 0; +} + +/* + * Corrects font family set oddly in IE6, S4/5, Chrome + * en.wikipedia.org/wiki/User:Davidgothberg/Test59 + */ + +pre, +code, +kbd, +samp { + font-family: monospace, serif; + _font-family: 'courier new', monospace; + font-size: 1em; +} + +/* + * Improves readability of pre-formatted text in all browsers + */ + +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} + +/* + * 1. Addresses CSS quotes not supported in IE6/7 + * 2. Addresses quote property not supported in S4 + */ + +/* 1 */ + +q { + quotes: none; +} + +/* 2 */ + +q:before, +q:after { + content: ''; + content: none; +} + +small { + font-size: 75%; +} + +/* + * Prevents sub and sup affecting line-height in all browsers + * gist.github.com/413930 + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + + +/* ============================================================================= + Lists + ========================================================================== */ + +/* + * Addresses margins set differently in IE6/7 + */ + +dl, +menu, +ol, +ul { + margin: 1em 0; +} + +dd { + margin: 0 0 0 40px; +} + +/* + * Addresses paddings set differently in IE6/7 + */ + +menu, +ol, +ul { + padding: 0 0 0 40px; +} + +/* + * Corrects list images handled incorrectly in IE7 + */ + +nav ul, +nav ol { + list-style: none; + list-style-image: none; +} + + +/* ============================================================================= + Embedded content + ========================================================================== */ + +/* + * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3 + * 2. Improves image quality when scaled in IE7 + * code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/ + */ + +img { + border: 0; /* 1 */ + -ms-interpolation-mode: bicubic; /* 2 */ +} + +/* + * Corrects overflow displayed oddly in IE9 + */ + +svg:not(:root) { + overflow: hidden; +} + + +/* ============================================================================= + Figures + ========================================================================== */ + +/* + * Addresses margin not present in IE6/7/8/9, S5, O11 + */ + +figure { + margin: 0; +} + + +/* ============================================================================= + Forms + ========================================================================== */ + +/* + * Corrects margin displayed oddly in IE6/7 + */ + +form { + margin: 0; +} + +/* + * Define consistent border, margin, and padding + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/* + * 1. Corrects color not being inherited in IE6/7/8/9 + * 2. Corrects text not wrapping in FF3 + * 3. Corrects alignment displayed oddly in IE6/7 + */ + +legend { + border: 0; /* 1 */ + padding: 0; + white-space: normal; /* 2 */ + *margin-left: -7px; /* 3 */ +} + +/* + * 1. Corrects font size not being inherited in all browsers + * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome + * 3. Improves appearance and consistency in all browsers + */ + +button, +input, +select, +textarea { + font-size: 100%; /* 1 */ + margin: 0; /* 2 */ + vertical-align: baseline; /* 3 */ + *vertical-align: middle; /* 3 */ +} + +/* + * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet + */ + +button, +input { + line-height: normal; /* 1 */ +} + +/* + * 1. Improves usability and consistency of cursor style between image-type 'input' and others + * 2. Corrects inability to style clickable 'input' types in iOS + * 3. Removes inner spacing in IE7 without affecting normal text inputs + * Known issue: inner spacing remains in IE6 + */ + +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; /* 1 */ + -webkit-appearance: button; /* 2 */ + *overflow: visible; /* 3 */ +} + +/* + * Re-set default cursor for disabled elements + */ + +button[disabled], +input[disabled] { + cursor: default; +} + +/* + * 1. Addresses box sizing set to content-box in IE8/9 + * 2. Removes excess padding in IE8/9 + * 3. Removes excess padding in IE7 + Known issue: excess padding remains in IE6 + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ + *height: 13px; /* 3 */ + *width: 13px; /* 3 */ +} + +/* + * 1. Addresses appearance set to searchfield in S5, Chrome + * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof) + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/* + * Removes inner padding and search cancel button in S5, Chrome on OS X + */ + +input[type="search"]::-webkit-search-decoration, +input[type="search"]::-webkit-search-cancel-button { + -webkit-appearance: none; +} + +/* + * Removes inner padding and border in FF3+ + * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/ + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/* + * 1. Removes default vertical scrollbar in IE6/7/8/9 + * 2. Improves readability and alignment in all browsers + */ + +textarea { + overflow: auto; /* 1 */ + vertical-align: top; /* 2 */ +} + + +/* ============================================================================= + Tables + ========================================================================== */ + +/* + * Remove most spacing between table cells + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/app/assets/templates/chatbox.jst.eco b/app/assets/templates/chatbox.jst.eco index cbf86b25..0aa4b316 100644 --- a/app/assets/templates/chatbox.jst.eco +++ b/app/assets/templates/chatbox.jst.eco @@ -1 +1,2 @@ + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dcfe2524..722f4e02 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,8 +2,8 @@ Kandan - <%= stylesheet_link_tag "application", :media => "all" %> <%= stylesheet_link_tag "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/ui-lightness/jquery-ui.css" %> + <%= stylesheet_link_tag "application", :media => "all" %> <%- Kandan::Config.broadcaster.assets.each do |asset| %> <%= javascript_include_tag asset %> diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index bb63552b..9588c619 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -4,7 +4,15 @@ }) <%- end %> -
-
-
+ +
+
+
+
+ +
+ +
+
+