zy:add profile page
This commit is contained in:
lovelyzhang
parent
6fc7ec9d88
commit
df353360f5
|
|
@ -0,0 +1,27 @@
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="Development: guoren" type="RailsRunConfigurationType" factoryName="Rails">
|
||||||
|
<predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
|
||||||
|
<module name="guoren" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
||||||
|
<envs />
|
||||||
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
||||||
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
||||||
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
||||||
|
<COVERAGE_PATTERN ENABLED="true">
|
||||||
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
||||||
|
</COVERAGE_PATTERN>
|
||||||
|
</EXTENSION>
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="Production: guoren" type="RailsRunConfigurationType" factoryName="Rails">
|
||||||
|
<predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
|
||||||
|
<module name="guoren" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
||||||
|
<envs />
|
||||||
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
||||||
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
||||||
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
||||||
|
<COVERAGE_PATTERN ENABLED="true">
|
||||||
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
||||||
|
</COVERAGE_PATTERN>
|
||||||
|
</EXTENSION>
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" />
|
||||||
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="spec: guoren" type="RakeRunConfigurationType" factoryName="Rake">
|
||||||
|
<module name="guoren" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
||||||
|
<envs />
|
||||||
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
||||||
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
||||||
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
||||||
|
<COVERAGE_PATTERN ENABLED="true">
|
||||||
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
||||||
|
</COVERAGE_PATTERN>
|
||||||
|
</EXTENSION>
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="spec" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":rspec " />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="test: guoren" type="RakeRunConfigurationType" factoryName="Rake">
|
||||||
|
<module name="guoren" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
||||||
|
<envs>
|
||||||
|
<env name="RAILS_ENV" value="test" />
|
||||||
|
</envs>
|
||||||
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
||||||
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
||||||
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
||||||
|
<COVERAGE_PATTERN ENABLED="true">
|
||||||
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
||||||
|
</COVERAGE_PATTERN>
|
||||||
|
</EXTENSION>
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
|
||||||
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
|
||||||
|
<method />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -78,9 +78,7 @@ class ChatController < ApplicationController
|
||||||
ok = false
|
ok = false
|
||||||
else
|
else
|
||||||
query_user = User.find_by(name: query_name)
|
query_user = User.find_by(name: query_name)
|
||||||
p "-----------here-------run----------"
|
|
||||||
if query_user.nil?
|
if query_user.nil?
|
||||||
p "-----------here-------run----------"
|
|
||||||
query_name = nil
|
query_name = nil
|
||||||
ok = false
|
ok = false
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -1 +1,108 @@
|
||||||
<% provide(:title, @user.name) %>
|
<% provide(:title, @user.name) %>
|
||||||
|
|
||||||
|
<div class="modal-shiftfix">
|
||||||
|
|
||||||
|
<div id="profile-container" class="container-fluid main-content">
|
||||||
|
|
||||||
|
<%= render 'layouts/nav' %>
|
||||||
|
|
||||||
|
<form action="/baidu" class="form-horizontal" id="profile" method="post">
|
||||||
|
<div class="row">
|
||||||
|
<div class="widget-container">
|
||||||
|
<div class="heading">
|
||||||
|
<i class="icon-user"></i>个人设置
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="widget-container">
|
||||||
|
<div class="heading">
|
||||||
|
<i class="icon-user"></i>用户图像
|
||||||
|
</div>
|
||||||
|
<div class="col-md-12 text-center">
|
||||||
|
<div class="fileupload fileupload-new" data-provides="fileupload">
|
||||||
|
<div class="fileupload-new img-thumbnail" style="width: 200px; height: 200px;">
|
||||||
|
<!--原照片-->
|
||||||
|
<img src="/images/avatars/default/avatar.png">
|
||||||
|
</div>
|
||||||
|
<div class="fileupload-preview fileupload-exists img-thumbnail"
|
||||||
|
style="width: 200px; max-height: 200px">
|
||||||
|
</div>
|
||||||
|
<div class="padded">
|
||||||
|
<span class="btn btn-default btn-file">
|
||||||
|
<span
|
||||||
|
class="fileupload-new">选择照片
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
class="fileupload-exists">
|
||||||
|
重新选择
|
||||||
|
</span>
|
||||||
|
<input type="file" name="image_file">
|
||||||
|
</span>
|
||||||
|
<a
|
||||||
|
class="btn btn-default fileupload-exists" data-dismiss="fileupload"
|
||||||
|
href="#">清除照片
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="widget-container fluid-height clearfix">
|
||||||
|
<div class="heading">
|
||||||
|
<i class="icon-reorder"></i>基本信息
|
||||||
|
</div>
|
||||||
|
<div class="padded">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="control-label col-md-2">姓名</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<input class="form-control" placeholder="Text" type="text">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="control-label col-md-2">专业</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<input class="form-control" placeholder="Text" type="text">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="control-label col-md-2">学院</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<select class="form-control">
|
||||||
|
<option value="Category 1">Option 1</option>
|
||||||
|
<option value="Category 2">Option 2</option>
|
||||||
|
<option value="Category 3">Option 3</option>
|
||||||
|
<option value="Category 4">Option 4</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="control-label col-md-2">性别</label>
|
||||||
|
<div class="col-md-9">
|
||||||
|
<label class="radio-inline"><input name="optionsRadios" type="radio"
|
||||||
|
value="1"><span>男</span></label><label
|
||||||
|
class="radio-inline"><input name="optionsRadios"
|
||||||
|
type="radio"
|
||||||
|
value="0"><span>女</span></label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="col-md-12 text-center">
|
||||||
|
<button class="btn btn-primary" type="submit">修改</button>
|
||||||
|
<button class="btn btn-default-outline">取消</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
Binary file not shown.
2401
log/development.log
2401
log/development.log
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1 @@
|
||||||
|
2205
|
||||||
Loading…
Reference in New Issue