个人主页的一些修改该
This commit is contained in:
parent
d4f99da5fa
commit
ec76e6b272
Binary file not shown.
|
After Width: | Height: | Size: 99 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 266 KiB |
|
|
@ -4370,11 +4370,11 @@
|
|||
});
|
||||
|
||||
var userCanSelect = function (obj) {
|
||||
obj.removeClass(classPrefix + "user-unselect").off("selectstart");
|
||||
obj.removeClass(classPrefix + "users-unselect").off("selectstart");
|
||||
};
|
||||
|
||||
var userUnselect = function (obj) {
|
||||
obj.addClass(classPrefix + "user-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
obj.addClass(classPrefix + "users-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
return false;
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
// "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
|
||||
@import "public";
|
||||
@import "common";
|
||||
|
||||
@import "bootstrap.min";
|
||||
@import "font-awesome";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
@charset "utf-8";
|
||||
|
||||
/*用户首页*/
|
||||
.content-page {
|
||||
margin-left: 240px;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
.content-page > .content {
|
||||
margin-top: 50px;
|
||||
padding: 20px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.profile-banner {
|
||||
width: 100%;
|
||||
height: 300px;
|
||||
background-position: center center;
|
||||
background-size: cover;
|
||||
position: relative;
|
||||
background-color: #252932;
|
||||
border-bottom: 4px solid #fff;
|
||||
box-shadow: 2px 0px 4px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
.avatar-container {
|
||||
height: 300px;
|
||||
text-align: center;
|
||||
}
|
||||
.profile-avatar {
|
||||
width: 200px;
|
||||
position: relative;
|
||||
margin: 0px auto;
|
||||
margin-top: 196px;
|
||||
border: 4px solid #f3f3f3;
|
||||
}
|
||||
|
||||
.profile-actions {
|
||||
position: absolute;
|
||||
bottom: 20px;
|
||||
}
|
||||
.user-profile-2 {
|
||||
margin-top: 50px;
|
||||
}
|
||||
.user-profile-sidebar {
|
||||
margin: 0 0 20px 0;
|
||||
}
|
||||
.user-profile-sidebar .user-identity {
|
||||
margin: 20px 0 0 0;
|
||||
}
|
||||
.user-profile-sidebar img {
|
||||
width: 90px;
|
||||
}
|
||||
|
|
@ -2019,14 +2019,7 @@ textarea#message{
|
|||
}
|
||||
|
||||
.badge {
|
||||
background-color: #c52d2f;
|
||||
border-radius: 5px;
|
||||
color: #fff;
|
||||
padding: 8px;
|
||||
position: relative;
|
||||
left: 60px;
|
||||
top: -18px;
|
||||
font-weight: normal;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
.blog_archieve {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
class SessionsController < ApplicationController
|
||||
|
||||
def new
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class UsersController < ApplicationController
|
|||
private
|
||||
|
||||
def user_params
|
||||
params.require(:user).permit(:name, :email, :password,
|
||||
params.require(:users).permit(:name, :email, :password,
|
||||
:password_confirmation)
|
||||
end
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ class UsersController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# Confirms the correct user.
|
||||
# Confirms the correct users.
|
||||
def correct_user
|
||||
@user = User.find(params[:id])
|
||||
redirect_to(root_url) unless current_user?(@user)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
class Job < ActiveRecord::Base
|
||||
belongs_to :user
|
||||
belongs_to :users
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,30 +1,4 @@
|
|||
<header id="header">
|
||||
<div class="top-bar">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-sm-6 col-xs-4">
|
||||
<div class="top-number"><p><i class="fa fa-phone-square"></i> +0123 456 70 90</p></div>
|
||||
</div>
|
||||
<div class="col-sm-6 col-xs-8">
|
||||
<div class="social">
|
||||
<ul class="social-share">
|
||||
<li><a href="#"><i class="fa fa-facebook"></i></a></li>
|
||||
<li><a href="#"><i class="fa fa-twitter"></i></a></li>
|
||||
<li><a href="#"><i class="fa fa-linkedin"></i></a></li>
|
||||
<li><a href="#"><i class="fa fa-dribbble"></i></a></li>
|
||||
<li><a href="#"><i class="fa fa-skype"></i></a></li>
|
||||
</ul>
|
||||
<div class="search">
|
||||
<form role="form">
|
||||
<input type="text" class="search-form" autocomplete="off" placeholder="Search">
|
||||
<i class="fa fa-search"></i>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><!--/.container-->
|
||||
</div><!--/.top-bar-->
|
||||
|
||||
<nav class="navbar navbar-inverse" role="banner">
|
||||
<div class="container">
|
||||
|
|
@ -35,14 +9,14 @@
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="index.html"><img src="/assets/logo.png" alt="logo"></a>
|
||||
<a class="navbar-brand" href="<%= home_path %>"><img src="/assets/logo.png" alt="logo"></a>
|
||||
</div>
|
||||
|
||||
<div class="collapse navbar-collapse navbar-left">
|
||||
<ul class="nav navbar-nav m0 mt12">
|
||||
<li class="<%= menu_active(@menu_type, 1) %>"><%= link_to "问答", questions_path %></li>
|
||||
<li class="<%= menu_active(@menu_type, 3) %>"><a href="services.html">知识库</a></li>
|
||||
<li class="<%= menu_active(@menu_type, 3) %>"><a href="services.html">文章</a></li>
|
||||
<li class="<%= menu_active(@menu_type, 3) %>"><a href="services.html">博客</a></li>
|
||||
<li class="<%= menu_active(@menu_type, 2) %>"><%= link_to "招聘", jobs_path %></li>
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">特色栏目 <i class="fa fa-angle-down"></i></a>
|
||||
|
|
@ -53,9 +27,6 @@
|
|||
<li><a href="shortcodes.html">Shortcodes</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="blog.html">Blog</a></li>
|
||||
<li><%= link_to "关于我们", about_path %></li>
|
||||
<li><a href="contact-us.html">Contact</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div><!--/.container-->
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<p class="clearfix email">
|
||||
<%= f.text_field :email, :required => true ,:placeholder=>"请输入邮箱地址"%>
|
||||
<br/>
|
||||
<span class="error-info"><%#= error_register_messages_for('user')[0] %></span>
|
||||
<span class="error-info"><%#= error_register_messages_for('users')[0] %></span>
|
||||
</p>
|
||||
|
||||
<p class="clearfix name">
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<p class="clearfix re-password">
|
||||
<%= f.password_field :password_confirmation, :size => 25, :required => true,:placeholder=>"请确认密码" %>
|
||||
<br/>
|
||||
<span class="error-info"><%#= error_register_messages_for('user')[2] %></span>
|
||||
<span class="error-info"><%#= error_register_messages_for('users')[2] %></span>
|
||||
</p>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,384 @@
|
|||
<div class="profile-banner" style="background-image: url('/assets/users/userbg.jpg');">
|
||||
<div class="col-sm-3 avatar-container">
|
||||
<img src="/assets/users/user-256.jpg" class="img-circle profile-avatar" alt="User avatar" >
|
||||
</div>
|
||||
<div class="col-sm-12 profile-actions text-right">
|
||||
<button type="button" class="btn btn-success btn-sm"><i class="fa fa-check"></i> Friends</button>
|
||||
<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-envelope"></i> 私信</button>
|
||||
<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-ellipsis-v"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<!-- ============================================================== -->
|
||||
<!-- Start Content here -->
|
||||
<!-- ============================================================== -->
|
||||
|
||||
<div class="content">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-3">
|
||||
<!-- Begin users profile -->
|
||||
<div class="text-center user-profile-2">
|
||||
<h4> 无限好 </h4>
|
||||
|
||||
<h5>学生</h5>
|
||||
<ul class="list-group">
|
||||
<li class="list-group-item">
|
||||
<span class="badge">1,245</span>
|
||||
粉丝
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<span class="badge">245</span>
|
||||
关注
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<span class="badge">1,245</span>
|
||||
问答
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- User button -->
|
||||
<div class="user-button">
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
<button type="button" class="btn btn-primary btn-sm btn-block"><i class="fa fa-envelope"></i> 私信</button>
|
||||
</div>
|
||||
<div class="col-lg-6">
|
||||
<button type="button" class="btn btn-default btn-sm btn-block"><i class="fa fa-user"></i> 加好友</button>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- End div .users-button -->
|
||||
</div><!-- End div .box-info -->
|
||||
<!-- Begin users profile -->
|
||||
</div><!-- End div .col-sm-4 -->
|
||||
|
||||
<div class="col-sm-9">
|
||||
<div class="widget widget-tabbed">
|
||||
<!-- Nav tab -->
|
||||
<ul class="nav nav-tabs nav-justified">
|
||||
<li class="active"><a href="#my-timeline" data-toggle="tab"><i class="fa fa-pencil"></i> 任务</a></li>
|
||||
<li><a href="#about" data-toggle="tab"><i class="fa fa-user"></i> 简介</a></li>
|
||||
<li><a href="#user-activities" data-toggle="tab"><i class="fa fa-laptop"></i> 动态</a></li>
|
||||
<li><a href="#mymessage" data-toggle="tab"><i class="fa fa-envelope"></i> 信息</a></li>
|
||||
</ul>
|
||||
<!-- End nav tab -->
|
||||
|
||||
<!-- Tab panes -->
|
||||
<div class="tab-content">
|
||||
|
||||
|
||||
<!-- Tab timeline -->
|
||||
<div class="tab-pane animated active fadeInRight" id="my-timeline">
|
||||
<div class="user-profile-content">
|
||||
|
||||
<!-- Begin timeline -->
|
||||
<div class="the-timeline">
|
||||
<form role="form" class="post-to-timeline">
|
||||
<textarea class="form-control" style="height: 70px;" placeholder="Whats on your mind..."></textarea>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<a class="btn btn-sm btn-default"><i class="fa fa-camera"></i></a>
|
||||
<a class="btn btn-sm btn-default"><i class="fa fa-video-camera"></i></a>
|
||||
<a class="btn btn-sm btn-default"><i class="fa fa-map-marker"></i></a>
|
||||
</div>
|
||||
<div class="col-sm-6 text-right"><button type="submit" class="btn btn-primary">提交</button></div>
|
||||
</div>
|
||||
</form>
|
||||
<br><br>
|
||||
<ul>
|
||||
<li>
|
||||
<div class="the-date">
|
||||
<span>01</span>
|
||||
<small>Feb</small>
|
||||
</div>
|
||||
<h4>Lorem ipsum dolor!</h4>
|
||||
<p>
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<div class="the-date">
|
||||
<span>31</span>
|
||||
<small>Jan</small>
|
||||
</div>
|
||||
<h4>Yohoo! you can put video here</h4>
|
||||
<div class="videoWrapper">
|
||||
<iframe src="//player.vimeo.com/video/85847275?title=0&byline=0&portrait=0"></iframe>
|
||||
</div>
|
||||
<p>
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<div class="the-date">
|
||||
<span>25</span>
|
||||
<small>Jan</small>
|
||||
</div>
|
||||
<h4>You also can put Soundcloud iframe here</h4>
|
||||
<iframe src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/132890481&color=ff9900&auto_play=false&hide_related=false&show_artwork=true"></iframe>
|
||||
<p>
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
|
||||
</p>
|
||||
</li>
|
||||
<li class="the-year"><p>2013</p></li>
|
||||
<li>
|
||||
<div class="the-date">
|
||||
<span>20</span>
|
||||
<small>Dec</small>
|
||||
</div>
|
||||
<p>
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
|
||||
</p>
|
||||
</li>
|
||||
<li>
|
||||
<div class="the-date">
|
||||
<span>27</span>
|
||||
<small>Nov</small>
|
||||
</div>
|
||||
<p>
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
|
||||
</p>
|
||||
</li>
|
||||
</ul>
|
||||
</div><!-- End div .the-timeline -->
|
||||
<!-- End timeline -->
|
||||
</div><!-- End div .users-profile-content -->
|
||||
</div><!-- End div .tab-pane -->
|
||||
<!-- End Tab timeline -->
|
||||
|
||||
<!-- Tab about -->
|
||||
<div class="tab-pane animated fadeInRight" id="about">
|
||||
<div class="user-profile-content">
|
||||
<h5><strong>ABOUT</strong> ME</h5>
|
||||
<p>
|
||||
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
|
||||
</p>
|
||||
<hr />
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<h5><strong>CONTACT</strong> ME</h5>
|
||||
<address>
|
||||
<strong>Phone</strong><br>
|
||||
<abbr title="Phone">+62 857 123 4567</abbr>
|
||||
</address>
|
||||
<address>
|
||||
<strong>Email</strong><br>
|
||||
<a href="mailto:#">first.last@example.com</a>
|
||||
</address>
|
||||
<address>
|
||||
<strong>Website</strong><br>
|
||||
<a href="http://r209.com">http://r209.com</a>
|
||||
</address>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<h5><strong>MY</strong> SKILLS</h5>
|
||||
<p>UI Design</p>
|
||||
<p>Clean and Modern Web Design</p>
|
||||
<p>PHP and MySQL Programming</p>
|
||||
<p>Vector Design</p>
|
||||
</div>
|
||||
</div><!-- End div .row -->
|
||||
</div><!-- End div .users-profile-content -->
|
||||
</div><!-- End div .tab-pane -->
|
||||
<!-- End Tab about -->
|
||||
|
||||
|
||||
<!-- Tab users activities -->
|
||||
<div class="tab-pane animated fadeInRight" id="user-activities">
|
||||
<div class="scroll-user-widget">
|
||||
<ul class="media-list">
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>John Doe</strong> Uploaded a photo <strong>"DSC000254.jpg"</strong>
|
||||
<br /><i>2 minutes ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>John Doe</strong> Created an photo album <strong>"Indonesia Tourism"</strong>
|
||||
<br /><i>8 minutes ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Annisa</strong> Posted an article <strong>"Yogyakarta never ending Asia"</strong>
|
||||
<br /><i>an hour ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Ari Rusmanto</strong> Added 3 products
|
||||
<br /><i>3 hours ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Hana Sartika</strong> Send you a message <strong>"Lorem ipsum dolor..."</strong>
|
||||
<br /><i>12 hours ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Johnny Depp</strong> Updated his avatar
|
||||
<br /><i>Yesterday</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>John Doe</strong> Uploaded a photo <strong>"DSC000254.jpg"</strong>
|
||||
<br /><i>2 minutes ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>John Doe</strong> Created an photo album <strong>"Indonesia Tourism"</strong>
|
||||
<br /><i>8 minutes ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Annisa</strong> Posted an article <strong>"Yogyakarta never ending Asia"</strong>
|
||||
<br /><i>an hour ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Ari Rusmanto</strong> Added 3 products
|
||||
<br /><i>3 hours ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Hana Sartika</strong> Send you a message <strong>"Lorem ipsum dolor..."</strong>
|
||||
<br /><i>12 hours ago</i></p>
|
||||
</a>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a href="#fakelink">
|
||||
<p><strong>Johnny Depp</strong> Updated his avatar
|
||||
<br /><i>Yesterday</i></p>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div><!-- End div .scroll-users-widget -->
|
||||
</div><!-- End div .tab-pane -->
|
||||
<!-- End Tab users activities -->
|
||||
|
||||
<!-- Tab users messages -->
|
||||
<div class="tab-pane animated fadeInRight" id="mymessage">
|
||||
<div class="scroll-user-widget">
|
||||
<ul class="media-list">
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/2.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">John Doe</a> <small>Just now</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/1.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Annisa</a> <small>Yesterday at 04:00 AM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam rhoncus</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/5.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Rusmanovski</a> <small>January 17, 2014 05:35 PM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/4.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Ari Rusmanto</a> <small>January 17, 2014 05:35 PM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/3.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Jenny Doe</a> <small>January 17, 2014 05:35 PM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/2.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">John Doe</a> <small>Just now</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/1.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Annisa</a> <small>Yesterday at 04:00 AM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam rhoncus</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/5.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Rusmanovski</a> <small>January 17, 2014 05:35 PM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/4.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Ari Rusmanto</a> <small>January 17, 2014 05:35 PM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
<li class="media">
|
||||
<a class="pull-left" href="#fakelink">
|
||||
<img class="media-object" src="assets/img/avatar/3.jpg" alt="Avatar">
|
||||
</a>
|
||||
<div class="media-body">
|
||||
<h4 class="media-heading"><a href="#fakelink">Jenny Doe</a> <small>January 17, 2014 05:35 PM</small></h4>
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit</p>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div><!-- End div .scroll-users-widget -->
|
||||
</div><!-- End div .tab-pane -->
|
||||
<!-- End Tab users messages -->
|
||||
</div><!-- End div .tab-content -->
|
||||
</div><!-- End div .box-info -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Footer Start -->
|
||||
<footer>
|
||||
Huban Creative © 2014
|
||||
<div class="footer-links pull-right">
|
||||
<a href="#">About</a><a href="#">Support</a><a href="#">Terms of Service</a><a href="#">Legal</a><a href="#">Help</a><a href="#">Contact Us</a>
|
||||
</div>
|
||||
</footer>
|
||||
<!-- Footer End -->
|
||||
</div>
|
||||
<!-- ============================================================== -->
|
||||
<!-- End content here -->
|
||||
<!-- ============================================================== -->
|
||||
|
||||
</div>
|
||||
|
|
@ -12,6 +12,7 @@ Rails.application.routes.draw do
|
|||
get 'help' => "welcomes#help"
|
||||
get 'signup' => 'users#new'
|
||||
get 'login' => 'sessions#new'
|
||||
get 'profile' => 'users/show'
|
||||
post 'login' => 'sessions#create'
|
||||
delete 'logout' => 'sessions#destroy'
|
||||
get 'about' => 'help#about'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ class CreateQuestions < ActiveRecord::Migration
|
|||
create_table :questions do |t|
|
||||
t.string :name
|
||||
t.text :content
|
||||
t.references :user, index: true, foreign_key: true
|
||||
t.references :users, index: true, foreign_key: true
|
||||
|
||||
t.timestamps null: false
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ class CreateJobs < ActiveRecord::Migration
|
|||
create_table :jobs do |t|
|
||||
t.string :name
|
||||
t.text :content
|
||||
t.references :user, index: true, foreign_key: true
|
||||
t.references :users, index: true, foreign_key: true
|
||||
|
||||
t.timestamps null: false
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4440,11 +4440,11 @@
|
|||
});
|
||||
|
||||
var userCanSelect = function (obj) {
|
||||
obj.removeClass(classPrefix + "user-unselect").off("selectstart");
|
||||
obj.removeClass(classPrefix + "users-unselect").off("selectstart");
|
||||
};
|
||||
|
||||
var userUnselect = function (obj) {
|
||||
obj.addClass(classPrefix + "user-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
obj.addClass(classPrefix + "users-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
return false;
|
||||
});
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -4370,11 +4370,11 @@
|
|||
});
|
||||
|
||||
var userCanSelect = function (obj) {
|
||||
obj.removeClass(classPrefix + "user-unselect").off("selectstart");
|
||||
obj.removeClass(classPrefix + "users-unselect").off("selectstart");
|
||||
};
|
||||
|
||||
var userUnselect = function (obj) {
|
||||
obj.addClass(classPrefix + "user-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
obj.addClass(classPrefix + "users-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
return false;
|
||||
});
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -54,7 +54,7 @@
|
|||
// EDITOR CONSTRUCTOR
|
||||
|
||||
// A CodeMirror instance represents an editor. This is the object
|
||||
// that user code is usually dealing with.
|
||||
// that users code is usually dealing with.
|
||||
|
||||
function CodeMirror(place, options) {
|
||||
if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
|
||||
|
|
@ -1454,7 +1454,7 @@
|
|||
te.style.cssText = oldCSS;
|
||||
if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
|
||||
|
||||
// Try to detect the user choosing select-all
|
||||
// Try to detect the users choosing select-all
|
||||
if (te.selectionStart != null) {
|
||||
if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
|
||||
var i = 0, poll = function() {
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ CodeMirror.defineMode("clojure", function (options) {
|
|||
stream.eatSpace();
|
||||
if (stream.eol() || stream.peek() == ";") {
|
||||
// nothing significant after
|
||||
// we restart indentation the user defined spaces after
|
||||
// we restart indentation the users defined spaces after
|
||||
pushStack(state, indentTemp + NORMAL_INDENT_UNIT, ch);
|
||||
} else {
|
||||
pushStack(state, indentTemp + stream.current().length, ch); // else we match
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
// Collect all Dockerfile directives
|
||||
var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
|
||||
"add", "copy", "entrypoint", "volume", "user",
|
||||
"add", "copy", "entrypoint", "volume", "users",
|
||||
"workdir", "onbuild"],
|
||||
instructionRegex = "(" + instructions.join('|') + ")",
|
||||
instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@
|
|||
'{',
|
||||
' [property "@fake"]: [string "@fake"],',
|
||||
' [property "@contextual"]: [string "@identifier"],',
|
||||
' [property "user@domain.com"]: [string "@graphical"],',
|
||||
' [property "users@domain.com"]: [string "@graphical"],',
|
||||
' [property "@ID"]: [string "@@ID"]',
|
||||
'}');
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
"[link&formatting&formatting-link <][link http://example.com/][link&formatting&formatting-link >]");
|
||||
|
||||
FT("formatting_linkEmail",
|
||||
"[link&formatting&formatting-link <][link user@example.com][link&formatting&formatting-link >]");
|
||||
"[link&formatting&formatting-link <][link users@example.com][link&formatting&formatting-link >]");
|
||||
|
||||
FT("formatting_escape",
|
||||
"[formatting-escape \\*]");
|
||||
|
|
@ -622,10 +622,10 @@
|
|||
"[link <http://example.com/>] foo [link <http://example.com/>]");
|
||||
|
||||
MT("linkEmail",
|
||||
"[link <user@example.com>] foo");
|
||||
"[link <users@example.com>] foo");
|
||||
|
||||
MT("linkEmailDouble",
|
||||
"[link <user@example.com>] foo [link <user@example.com>]");
|
||||
"[link <users@example.com>] foo [link <users@example.com>]");
|
||||
|
||||
MT("emAsterisk",
|
||||
"[em *foo*] bar");
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -306,7 +306,7 @@ CodeMirror.defineMode("perl",function(){
|
|||
formline :1, // - internal function used for formats
|
||||
getc :1, // - get the next character from the filehandle
|
||||
getgrent :1, // - get next group record
|
||||
getgrgid :1, // - get group record given group user ID
|
||||
getgrgid :1, // - get group record given group users ID
|
||||
getgrnam :1, // - get group record given group name
|
||||
gethostbyaddr :1, // - get host record given its address
|
||||
gethostbyname :1, // - get host record given name
|
||||
|
|
@ -323,8 +323,8 @@ CodeMirror.defineMode("perl",function(){
|
|||
getprotobynumber :1, // - get protocol record numeric protocol
|
||||
getprotoent :1, // - get next protocols record
|
||||
getpwent :1, // - get next passwd record
|
||||
getpwnam :1, // - get passwd record given user login name
|
||||
getpwuid :1, // - get passwd record given user ID
|
||||
getpwnam :1, // - get passwd record given users login name
|
||||
getpwuid :1, // - get passwd record given users ID
|
||||
getservbyname :1, // - get services record given its name
|
||||
getservbyport :1, // - get services record given numeric port
|
||||
getservent :1, // - get next services record
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ CodeMirror.defineMode("puppet", function () {
|
|||
'nagios_servicegroup nagios_timeperiod name notify outiface package proto reject ' +
|
||||
'resources router schedule scheduled_task selboolean selmodule service source ' +
|
||||
'sport ssh_authorized_key sshkey stage state table tidy todest toports tosource ' +
|
||||
'user vlan yumrepo zfs zone zpool');
|
||||
'users vlan yumrepo zfs zone zpool');
|
||||
|
||||
// After finding a start of a string ('|") this function attempts to find the end;
|
||||
// If a variable is encountered along the way, we display it differently when it
|
||||
|
|
@ -73,7 +73,7 @@ CodeMirror.defineMode("puppet", function () {
|
|||
// Matches non-builtin resource declarations
|
||||
// (i.e. "apache::vhost {" or "mycustomclasss {" would be matched)
|
||||
var resource = stream.match(/(\s+)?[\w:_]+(\s+)?{/, false);
|
||||
// Matches virtual and exported resources (i.e. @@user { ; and the like)
|
||||
// Matches virtual and exported resources (i.e. @@users { ; and the like)
|
||||
var special_resource = stream.match(/(\s+)?[@]{1,2}[\w:_]+(\s+)?{/, false);
|
||||
|
||||
// Finally advance the stream
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
|
|||
// variables
|
||||
// @@prefix.varName @varName
|
||||
// varName can be quoted with ` or ' or "
|
||||
// ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
|
||||
// ref: http://dev.mysql.com/doc/refman/5.5/en/users-variables.html
|
||||
if (stream.eat("@")) {
|
||||
stream.match(/^session\./);
|
||||
stream.match(/^local\./);
|
||||
|
|
@ -293,7 +293,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
|
|||
CodeMirror.defineMIME("text/x-mysql", {
|
||||
name: "sql",
|
||||
client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
|
||||
keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
|
||||
keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm users user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
|
||||
builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
|
||||
atoms: set("false true null unknown"),
|
||||
operatorChars: /^[*+\-%<>!=&|^]/,
|
||||
|
|
@ -309,7 +309,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
|
|||
CodeMirror.defineMIME("text/x-mariadb", {
|
||||
name: "sql",
|
||||
client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
|
||||
keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
|
||||
keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm users user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
|
||||
builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
|
||||
atoms: set("false true null unknown"),
|
||||
operatorChars: /^[*+\-%<>!=&|^]/,
|
||||
|
|
@ -341,7 +341,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
|
|||
name: "sql",
|
||||
client: set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
|
||||
keywords: set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
|
||||
builtin: set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
|
||||
builtin: set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper users userenv varchar varchar2 variance varying vsize xml"),
|
||||
operatorChars: /^[*+\-%<>!=~]/,
|
||||
dateSQL: set("date time timestamp"),
|
||||
support: set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -77,7 +77,7 @@
|
|||
'Question? is not a citation.');
|
||||
|
||||
MT('codeBogus',
|
||||
'user@example.com');
|
||||
'users@example.com');
|
||||
|
||||
MT('subBogus',
|
||||
'~username');
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -4358,11 +4358,11 @@
|
|||
});
|
||||
|
||||
var userCanSelect = function (obj) {
|
||||
obj.removeClass(classPrefix + "user-unselect").off("selectstart");
|
||||
obj.removeClass(classPrefix + "users-unselect").off("selectstart");
|
||||
};
|
||||
|
||||
var userUnselect = function (obj) {
|
||||
obj.addClass(classPrefix + "user-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
obj.addClass(classPrefix + "users-unselect").on("selectstart", function(event) { // selectstart for IE
|
||||
return false;
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -455,11 +455,11 @@
|
|||
'.ace_button {',
|
||||
'margin-left: 2px;',
|
||||
'cursor: pointer;',
|
||||
'-webkit-user-select: none;',
|
||||
'-moz-user-select: none;',
|
||||
'-o-user-select: none;',
|
||||
'-ms-user-select: none;',
|
||||
'user-select: none;',
|
||||
'-webkit-users-select: none;',
|
||||
'-moz-users-select: none;',
|
||||
'-o-users-select: none;',
|
||||
'-ms-users-select: none;',
|
||||
'users-select: none;',
|
||||
'overflow: hidden;',
|
||||
'opacity: 0.7;',
|
||||
'border: 1px solid rgba(100,100,100,0.23);',
|
||||
|
|
@ -482,11 +482,11 @@
|
|||
'.ace_search_options{',
|
||||
'margin-bottom: 3px;',
|
||||
'text-align: right;',
|
||||
'-webkit-user-select: none;',
|
||||
'-moz-user-select: none;',
|
||||
'-o-user-select: none;',
|
||||
'-ms-user-select: none;',
|
||||
'user-select: none;',
|
||||
'-webkit-users-select: none;',
|
||||
'-moz-users-select: none;',
|
||||
'-o-users-select: none;',
|
||||
'-ms-users-select: none;',
|
||||
'users-select: none;',
|
||||
'}'
|
||||
].join('');
|
||||
|
||||
|
|
|
|||
|
|
@ -752,7 +752,7 @@ function runLoggingCallbacks( key, args ) {
|
|||
}
|
||||
|
||||
// DEPRECATED: This will be removed on 2.0.0+
|
||||
// This function verifies if the loggingCallbacks were modified by the user
|
||||
// This function verifies if the loggingCallbacks were modified by the users
|
||||
// If so, it will restore it, assign the given callback and print a console warning
|
||||
function verifyLoggingCallbacks() {
|
||||
var loggingCallback, userCallback;
|
||||
|
|
@ -1227,7 +1227,7 @@ function generateHash( module, testName ) {
|
|||
}
|
||||
|
||||
// Convert the possibly negative integer hash code into an 8 character hex string, which isn't
|
||||
// strictly necessary but increases user understanding that the id is a SHA-like hash
|
||||
// strictly necessary but increases users understanding that the id is a SHA-like hash
|
||||
hex = ( 0x100000000 + hash ).toString( 16 );
|
||||
if ( hex.length < 8 ) {
|
||||
hex = "0000000" + hex;
|
||||
|
|
@ -1275,7 +1275,7 @@ QUnit.assert = Assert.prototype = {
|
|||
};
|
||||
},
|
||||
|
||||
// Exports test.push() to the user API
|
||||
// Exports test.push() to the users API
|
||||
push: function( /* result, actual, expected, message */ ) {
|
||||
var assert = this,
|
||||
currentTest = ( assert instanceof Assert && assert.test ) || QUnit.config.current;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ class UsersSignupTest < ActionDispatch::IntegrationTest
|
|||
test "valid signup information" do
|
||||
get signup_path
|
||||
assert_difference 'User.count', 1 do
|
||||
post_via_redirect users_path, user: { name: "Example User",
|
||||
email: "user@example.com",
|
||||
post_via_redirect users_path, users: { name: "Example User",
|
||||
email: "users@example.com",
|
||||
password: "password",
|
||||
password_confirmation: "password" }
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ require 'test_helper'
|
|||
class UserTest < ActiveSupport::TestCase
|
||||
|
||||
def setup
|
||||
@user = User.new(name: "Example User", email: "user@example.com",
|
||||
@user = User.new(name: "Example User", email: "users@example.com",
|
||||
password: "foobar", password_confirmation: "foobar")
|
||||
end
|
||||
# test "the truth" do
|
||||
|
|
|
|||
Loading…
Reference in New Issue