diff --git a/app/assets/images/module_icon.png b/app/assets/images/module_icon.png new file mode 100644 index 000000000..23b980d59 Binary files /dev/null and b/app/assets/images/module_icon.png differ diff --git a/app/assets/images/module_icon@2X.png b/app/assets/images/module_icon@2X.png new file mode 100644 index 000000000..616dadffb Binary files /dev/null and b/app/assets/images/module_icon@2X.png differ diff --git a/app/assets/stylesheets/lib/codemirror/theme/midnight.css b/app/assets/stylesheets/lib/codemirror/theme/midnight.css new file mode 100644 index 000000000..e567625c6 --- /dev/null +++ b/app/assets/stylesheets/lib/codemirror/theme/midnight.css @@ -0,0 +1,52 @@ +/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */ + +/**/ +.breakpoints {width: .8em;} +.breakpoint { color: #822; } + +/**/ +span.CodeMirror-matchhighlight { background: #494949 } +.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67; !important } + +/**/ +.activeline {background: #253540 !important;} + +.cm-s-midnight.CodeMirror { + background: #0F192A; + color: #D1EDFF; +} + +.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;} + +.cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;} +.cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;} +.cm-s-midnight .CodeMirror-linenumber {color: #D0D0D0;} +.cm-s-midnight .CodeMirror-cursor { + border-left: 1px solid #F8F8F0 !important; +} + +.cm-s-midnight span.cm-comment {color: #428BDD;} +.cm-s-midnight span.cm-atom {color: #AE81FF;} +.cm-s-midnight span.cm-number {color: #D1EDFF;} + +.cm-s-midnight span.cm-property, .cm-s-tropicaleve span.cm-attribute {color: #A6E22E;} +.cm-s-midnight span.cm-keyword {color: #E83737;} +.cm-s-midnight span.cm-string {color: #1DC116;} + +.cm-s-midnight span.cm-variable {color: #FFAA3E;} +.cm-s-midnight span.cm-variable-2 {color: #FFAA3E;} +.cm-s-midnight span.cm-def {color: #4DD;} +.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;} +.cm-s-midnight span.cm-bracket {color: #D1EDFF;} +.cm-s-midnight span.cm-tag {color: #008;} +.cm-s-midnight span.cm-link {color: #AE81FF;} + +.cm-s-midnight .CodeMirror-matchingbracket { + text-decoration: underline; + color: white !important; +} + +.typ { color: #FFAA3E; } +.atn { color: #606; } +.atv { color: #080; } +.dec { color: #606; } diff --git a/app/assets/stylesheets/lib/codemirror/theme/theme.css b/app/assets/stylesheets/lib/codemirror/theme/theme.css index 26ffb846f..d1162b50a 100644 --- a/app/assets/stylesheets/lib/codemirror/theme/theme.css +++ b/app/assets/stylesheets/lib/codemirror/theme/theme.css @@ -1,21 +1,23 @@ -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/ambiance-mobile.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/ambiance.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/blackboard.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/cobalt.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/eclipse.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/elegant.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/erlang-dark.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/midnight.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/monokai.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/neat.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/night.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/rubyblue.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/solarized.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/theme.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/twilight.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/vibrant-ink.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/xq-dark.css); -@import url(/orbit_4.0.1/assets/stylesheets/lib/codemirror/theme/xq-light.css); +/* + *= require 'lib/codemirror/theme/ambiance-mobile' + *= require "lib/codemirror/theme/ambiance" + *= require "lib/codemirror/theme/blackboard" + *= require "lib/codemirror/theme/cobalt" + *= require "lib/codemirror/theme/eclipse" + *= require "lib/codemirror/theme/elegant" + *= require "lib/codemirror/theme/erlang-dark" + *= require "lib/codemirror/theme/midnight" + *= require "lib/codemirror/theme/monokai" + *= require "lib/codemirror/theme/neat" + *= require "lib/codemirror/theme/night" + *= require "lib/codemirror/theme/rubyblue" + *= require "lib/codemirror/theme/solarized" + *= require "lib/codemirror/theme/theme" + *= require "lib/codemirror/theme/twilight" + *= require "lib/codemirror/theme/vibrant-ink" + *= require "lib/codemirror/theme/xq-dark" + *= require "lib/codemirror/theme/xq-light" +*/ .cm-tab { border-left: 1px solid rgba(200, 200, 200, .2); } \ No newline at end of file diff --git a/app/views/admin/designs/_design.html.erb b/app/views/admin/designs/_design.html.erb index 82a37c1a6..24c99b41f 100644 --- a/app/views/admin/designs/_design.html.erb +++ b/app/views/admin/designs/_design.html.erb @@ -9,7 +9,7 @@ - <%= radio_button_tag 'design_default', design.id, (@site.design.id.to_s.eql?(design.id.to_s) ? true : false), :class => 'design_default', :rel => admin_sites_path %> <%= design.intro %> <%= design.author %> + <%= radio_button_tag 'design_default', design.id, (@site.design.id.to_s.eql?(design.id.to_s) ? true : false), :class => 'design_default toggle-check', :rel => admin_sites_path %> \ No newline at end of file diff --git a/app/views/admin/designs/_designs.html.erb b/app/views/admin/designs/_designs.html.erb index de11dc784..2ac8ef2a6 100644 --- a/app/views/admin/designs/_designs.html.erb +++ b/app/views/admin/designs/_designs.html.erb @@ -1,11 +1,12 @@ - - - - - - - + + + Templates Title + Active + Date of purchase + Designer + + diff --git a/app/views/admin/designs/edit.html.erb b/app/views/admin/designs/edit.html.erb index 37e67808b..9b0ef7fad 100644 --- a/app/views/admin/designs/edit.html.erb +++ b/app/views/admin/designs/edit.html.erb @@ -2,7 +2,27 @@ <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %> <% end %> -

<%= t('editing.design') %>

+ + <%= stylesheet_link_tag "lib/wrap-nav"%> + <%= stylesheet_link_tag "lib/main-list"%> + <%= stylesheet_link_tag "lib/mt-list"%> + <%= stylesheet_link_tag "lib/filter"%> + <%= stylesheet_link_tag "lib/codemirror/theme/theme"%> + + <%= javascript_include_tag 'codemirror/codemirror' %> + <%= javascript_include_tag 'codemirror/jquery.codemirror' %> + <%= javascript_include_tag 'codemirror/mode/css' %> + <%= javascript_include_tag 'codemirror/mode/xml' %> + <%= javascript_include_tag 'codemirror/mode/vbscript' %> + <%= javascript_include_tag 'codemirror/mode/javascript' %> + <%= javascript_include_tag 'codemirror/mode/htmlmixed' %> + <%= javascript_include_tag 'codemirror/addon/edit/closetag' %> + <%= javascript_include_tag 'codemirror/addon/edit/closebrackets' %> + <%= javascript_include_tag 'codemirror/util/formatting' %> + <%= javascript_include_tag 'lib/templates_code' %> + + +

<%= @design.title %>