From ff93670949230593e96dc4b46c84aa6d9d83f050 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Thu, 3 Oct 2013 12:47:07 +0800 Subject: [PATCH] Updated template editing --- app/assets/images/module_icon.png | Bin 0 -> 2594 bytes app/assets/images/module_icon@2X.png | Bin 0 -> 4275 bytes .../lib/codemirror/theme/midnight.css | 52 ++++++ .../lib/codemirror/theme/theme.css | 38 ++-- app/views/admin/designs/_design.html.erb | 2 +- app/views/admin/designs/_designs.html.erb | 15 +- app/views/admin/designs/edit.html.erb | 22 ++- app/views/admin/designs/index.html.erb | 15 ++ app/views/admin/module_store/index.html.erb | 162 +++++++++--------- 9 files changed, 197 insertions(+), 109 deletions(-) create mode 100644 app/assets/images/module_icon.png create mode 100644 app/assets/images/module_icon@2X.png create mode 100644 app/assets/stylesheets/lib/codemirror/theme/midnight.css diff --git a/app/assets/images/module_icon.png b/app/assets/images/module_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..23b980d59449c065e378d6d16888b5f940dce0b1 GIT binary patch literal 2594 zcmaJ@c|25WAGf74NNFQCV~7;98N(bqGs?|aM`)QkGjlMQIn&Hoqn9k{lFAl|_EJ() zlPx8Ql&u<dvJsmW zAPk_o15B8M24{WH(Hx!}Ehlq`=7G#GNQh)W!ECM_YNX~S3dv^Kq5LhWSSrs23SqC0 z-LVj}*hS{P1Nh*Nq zg>-@W5YiHDVa~+ja7ZE%jU!kRi8wPP9*e_cu=1B^jw1k;L;!Dv{QjWi(fF(&z=!Pm zJ(m1rhYAr2c>o3z6%~b!vOvT9U<{5#BF%E(@#b<5b3qJO2u7Q81%^Ku$dG`^XY+(? zn2Vfc1Q~FI&<-Wf^q&$qyq~mO!S^=F8-|Gnc^DiTJ6qBZM=JIIyK*=`y#+!a=-+(* zC$WGQ!-FtBkN}S0Gv$K|GMo*?16=qJD1`Ym7!Lo@MXwN82n#}B9@52^h+IttnQZQ? z!Sow~N(J1w0wKs{LT+R`l$-<2X0res$=cF|f~Sz3ad;e#f_JhYQ79xV*42e%X-UC5 z|G<)AW&{V~3V&c(|6*N#iJcV#hbNCrhWPAAh~>(MImmBC1MFYt;_^$r?^xEab0Pl{ zi;*XTnH}wajrxa4uAkZMPvOcBKcx?G<$CAKg*~lQQK6uqn&U=xqD4P`Ss3P??Z3R~ z>kThcuhq*GkEbjpH<$wGF{S#&8SQN;Z}J+e%>>)5WNj^Z;rbPjM=(*`7QeNkD!#|E zqn~_-sGY-3tva68JE!@E)uz~|F?6+);@pa>9t=P*;zbpdw(Y#l)g1K zLz#+iw1(#A;#*jG$)gAIq*(D_D;hVQS1{nDk({1TduvF`0$1<5*JCYfN=bY_KfZoQ zIVdzrq2Z$}w=nFUBaqh1yqLVgJ!r?Z>jzj)hGbmTnr#iGWeZ}pJ-VJr- z(L&mWxjCgn(HHkxJbmJHs1pQgtW>x$SZ|NR?|mbU9+)6dbP;8R`YE^V4COp1Z(ulxI_j2n$)pRuh2&sFle19$!+cI zqwJ<23Q!9gPnX|q!z3i!s-6KCJ&*sQ4=T1sbsu{Wf$Fo)SaL;=)@8dt zI`+AEg^oC0^kVq;3DTC_zhhrX3yqWc>(g`%C95uX`#w~{l{b@j|VoTyUZko}P6T!0q(bcRv_zWU77 ztYG=hDej(}ur+&ocE!xN2r)Txv}pO8;Yd=~af#zdlit7{UE|f4rA^~gxvP==)lVe0OI;-ka&wO0|1%^RHpu5pjjEgp2sl36@HmT~ zNN` zCLqY7vE*Kv64mBqwHj?WT2i{JdE;7x?1uj4k$qmC9!Q)^^FZ8h%MuT^_v!U>-|kT| z69yc-&DeG>CaVVJ45~Mbja~3HAaqz@3)^SZ$#Gwo;M3`FJ@nBjJIFhA2-Z7b*EdJ z8?D3EDR}>awWEK{x^2X$6Tw?5C(gb0G`yCQO?}bbzB}Gilt@z^Z>C1k62~mR5SqJW zC=+Lz|iEE9dVs;R=jg1moyr>*l2Ier4mgbd|IS?lvp9yG47&##>j4!d6BvH zhhz1T86l(Ix1VyEg9jAHyLAhR7WG*Z8csK_n4qtMsdID^^E~N*)HV?kfs@xJor=U) z|H?0$IyNz)%}WKfns?VHTqu1%fk5corw^;WIWoB-Kh%?!6}b6|Nq-X3ep4{})BK9- z#kX4u#3wQ+d8I;g2==p0<@-s0^o4W}GD;-DPdY3(Z`H#)KSs>#`rwscIQ+=* zl-a#`b3~6S3AurXKcC%E9^5)7(j$nj?m@hIa_57aT3C<8hhrIz2nFNfc};^o4;*aY z2{xDZt&FMLLfKuZK2iiXKIl&N95&WCb63S!XZb{v13eXdT;oj2)NzNOuT}X99_3+Lr!MG2yV0XU3xZEJD~iG#UUKyGO9`jm>^rQZAp4($lC^tu{#lkF8K~x49>qdw!kG{{5Lb zj3YO?(!=7lAE1witW??hJhzB@qHIsjA<8t@HkMF8X<20F_eJR;hC#buc6+4mwvCcE zim@{a?8ns)b*@(3wXfja*MnVF`SB}^9#0sEFWIH!!FZb`6j1|z!s#-BqB4=yl%8{$ zf_-x;`I6cdYu%senP-ZID2mSc%*fvbnE!lgK_WuuJfdcr4fK( k?2=20^y`1fE-5H0G~DtFkd>i~W^Zk76c6%6=k2@y1}Nxc-v9sr literal 0 HcmV?d00001 diff --git a/app/assets/images/module_icon@2X.png b/app/assets/images/module_icon@2X.png new file mode 100644 index 0000000000000000000000000000000000000000..616dadffb57dae2090201fd7bc73cbe2d8d5c064 GIT binary patch literal 4275 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/ +.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 26ffb846..d1162b50 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 82a37c1a..24c99b41 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 de11dc78..2ac8ef2a 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 37e67808..9b0ef7fa 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 %>