Push latest changes to master

.gitignore

@@ -23,14 +23,14 @@ tmp
 /config/application.yml
 /config/database.yml
 /config/slack.yml
-/config/currencies.yml
-/config/markets.yml
+#/config/currencies.yml
+#/config/markets.yml
 /config/amqp.yml
 /config/banks.yml
 
 # Ignore translations.js
 /public/javascripts/translations.js
-
+/public/results.txt
 # Ignore ctags
 .tags
 tags

app/views/shared/_footer.html.slim

@@ -1,22 +1,4 @@
 footer
   .container
     .row.text-center
-      p
-        | Maintained by the
-        a<> target='_blank' href='https://github.com/orgs/peatio/people' core team
-        | with the help of
-        a< target='_blank' href='https://github.com/peatio/peatio/graphs/contributors' our contributors
-        | .
-      p
-        | Code licensed under
-        a< target='_blank' href='http://peatio.mit-license.org/' MIT
-        | , documentation under
-        a< target='_blank' href='http://creativecommons.org/licenses/by/3.0/' CC BY 3.0
-        | .
-      p: ul.list-inline
-        li: span Currently v#{Peatio::VERSION}
-        li: a target='_blank' href='https://github.com/peatio/peatio' GitHub
-        li: a target='_blank' href='https://github.com/peatio/peatio/tree/master/doc' Documents
-        li: a target='_blank' href='https://github.com/peatio/peatio/wiki/About' About
-        li: a target='_blank' href='https://github.com/peatio/peatio/issues?state=open' Issues
-        li: a target='_blank' href='https://github.com/peatio/peatio/releases' Releases
+      Copyright 2017

app/views/shared/_header.html.slim

@@ -1,12 +1,12 @@
 header.navbar.navbar-default.navbar-static-top role = "navigation"
   .container
     ul#menu.nav.navbar-nav.navbar-left
-      a.text-center.navbar-brand href='#{root_path}' PEATIO
+      a.text-center.navbar-brand href='#{root_path}' Cryex24
       = top_nav_link(t('header.market'), market_path(current_market.id), 'exchange', target: true)
-      = top_nav_link(t('header.funds'), funds_path, 'money', controllers: ['funds']) if current_user
-      = top_nav_link(t('header.assets'), exchange_assets_path, 'bar-chart-o')
+      = top_nav_link(t('header.funds'), 'http://www.cryex24.com/funds', 'money', controllers: ['funds']) if current_user
       = top_nav_link(t('header.history'), order_history_path, 'book', controllers: ['history']) if current_user
 
+
     ul.nav.navbar-nav.navbar-right
       = render partial: 'shared/header_account_balance' if current_user && controller_name == 'markets'
       = render partial: 'shared/header_profile_setting' if current_user

app/views/shared/_header.html.slim~

@@ -0,0 +1,16 @@
+header.navbar.navbar-default.navbar-static-top role = "navigation"
+  .container
+    ul#menu.nav.navbar-nav.navbar-left
+      a.text-center.navbar-brand href='#{root_path}' Cryex24
+      = top_nav_link(t('header.market'), market_path(current_market.id), 'exchange', target: true)
+      = top_nav_link(t('header.funds'), funds_path, 'money', controllers: ['funds']) if current_user
+      = top_nav_link(t('header.history'), order_history_path, 'book', controllers: ['history']) if current_user
+      = top_nav_link(t('header.history'), "http://www.cyrex24.com/funds", 'book', controllers: ['history']) if current_user
+
+
+    ul.nav.navbar-nav.navbar-right
+      = render partial: 'shared/header_account_balance' if current_user && controller_name == 'markets'
+      = render partial: 'shared/header_profile_setting' if current_user
+      = top_nav_link(t('header.signin'), signin_path, '') unless current_user
+      = top_nav_link(t('header.signup'), signup_path, '') unless current_user
+      = render partial: 'shared/header_lang_sel'

app/views/welcome/index.html.slim

@@ -1,12 +1,6 @@
 header.text-center
-  .ribbon
-    a href="https://github.com/peatio/peatio" View on GitHub
   .container
-    a href='http://github.com/peatio/peatio'
-      img src='#{image_path 'logo.png'}' width='336px'
     section
-      - Rails.configuration.i18n.available_locales.each do |locale|
-        h3 = t(:slogan, locale: locale)
     #getstart.row
       - unless current_user
         .col-xs-4.col-xs-offset-8
@@ -19,5 +13,4 @@ header.text-center
       - else
         .col-xs-6.col-xs-offset-9.text-center
           a href="#{market_path(current_market)}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.getstart")
-          a href="#{funds_path}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.funds")
           a href="#{settings_path}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.settings")

app/views/welcome/oldindex.html.slim

@@ -0,0 +1,23 @@
+header.text-center
+  .ribbon
+    a href="https://github.com/peatio/peatio" View on GitHub
+  .container
+    a href='http://github.com/peatio/peatio'
+      img src='#{image_path 'logo.png'}' width='336px'
+    section
+      - Rails.configuration.i18n.available_locales.each do |locale|
+        h3 = t(:slogan, locale: locale)
+    #getstart.row
+      - unless current_user
+        .col-xs-4.col-xs-offset-8
+          a href="#{signin_path}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.signin")
+        - if ENV['WEIBO_AUTH'] == "true"
+          .col-xs-4
+            a href="/auth/weibo" class="btn btn-primary btn-lg btn-block" role="button" = t("header.login_via_weibo")
+        .col-xs-4
+          a href="#{signup_path}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.signup")
+      - else
+        .col-xs-6.col-xs-offset-9.text-center
+          a href="#{market_path(current_market)}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.getstart")
+          a href="#{funds_path}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.funds")
+          a href="#{settings_path}" class="btn btn-primary btn-lg btn-block" role="button" = t("header.settings")

config/currencies.yml~

@@ -0,0 +1,54 @@
+- id: 1
+  key: renminbi
+  code: cny
+  symbol: "¥"
+  coin: false
+  precision: 2
+  assets:
+    accounts:
+      -
+        bank: '招商银行'
+        address: '6225 0885 6022 3501'
+        password: '111111'
+        tel: '95555'
+- id: 2
+  key: satoshi
+  code: btc
+  symbol: "฿"
+  coin: true
+  quick_withdraw_max: 0
+  rpc: http://scatterp:0c5u8ZVSK7az@127.0.0.1:18332
+  blockchain: https://blockchain.info/tx/#{txid}
+  address_url: https://blockchain.info/address/#{address}
+  assets:
+    accounts:
+      -
+        address: 1HjfnJpQmANtuW7yr1ggeDfyfe1kDK7rm3
+- id: 3
+  key: ether
+  code: eth
+  symbol: "฿"
+  coin: true
+  precision: 4
+  quick_withdraw_max: 0
+  rpc: http://localhost
+  blockchain: https://etherscan.io/tx/#{txid}
+  address_url: https://etherscan.io/address/#{address}
+  assets:
+    accounts:
+      -
+        address: 0x4bA2474e063Aec44e23F2Bf7Fb9e4e2878dBaB44
+- id: 4
+  key: etc
+  code: etc
+  symbol: "฿"
+  coin: true
+  precision: 4
+  quick_withdraw_max: 0
+  rpc: http://localhost
+  blockchain: https://etherscan.io/tx/#{txid}
+  address_url: https://etherscan.io/address/#{address}
+  assets:
+    accounts:
+      -
+        address: 0x4bA2474e063Aec44e23F2Bf7Fb9e4e2878dBaB44

config/locales/server.en.yml

@@ -1061,15 +1061,15 @@ en:
       panel: Login
       new:
         title: Login my account
-        intro: Login Peatio now for you to exchange.
+        intro: Login Cryex24.
       failure:
         title: Login my account
-        intro: Login Peatio now for you to exchange.
+        intro: Login Cryex24.
     identities:
       panel: Create Account
       new:
         title: Create My Account
-        intro: This will be your only ID on Peatio which is necessary for your exchange
+        intro: This will be your only ID on Cryex24 which is necessary for your exchange
           , deposit and withdrawal . please fill it out carefully.
       edit:
         panel: My Account
@@ -1085,7 +1085,7 @@ en:
         email: E-mail Address
         password: Password
       identity:
-        email: Example：xiaobai@example.com
+        email: Example：user@example.com
         password: Please set your login password
         password_confirmation: Confirm your password
         edit: