Changeset - ff15232ce9d2
[Not reviewed]
default
0 4 0
Marcin Kuzminski - 15 years ago 2010-10-11 01:58:19
marcin@python-works.com
fixed search button
4 files changed with 12 insertions and 12 deletions:
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
Show inline comments
 
@@ -1433,385 +1433,384 @@ div.options a:hover {
 
	border-width: 0;
 
	color: #000000;
 
	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 
		Lucida Sans Unicode, Arial, sans-serif;
 
	font-size: 11px;
 
	outline: none;
 
}
 
 
#content div.box-left div.form div.fields div.field div.textarea textarea,#content div.box-right div.form div.fields div.field div.textarea textarea
 
	{
 
	width: 100%;
 
	height: 100px;
 
}
 
 
#content div.box div.form div.fields div.field div.textarea textarea.error
 
	{
 
	padding: 3px 10px 10px 23px;
 
	background-color: #FBE3E4;
 
	background-image: url("../../../resources/images/icons/exclamation.png");
 
	background-repeat: no-repeat;
 
	background-position: 3px 3px;
 
	border: 1px solid #FBC2C4;
 
}
 
 
#content div.box div.form div.fields div.field div.textarea textarea.success
 
	{
 
	padding: 3px 10px 10px 23px;
 
	background-color: #E6EFC2;
 
	background-image: url("../../../resources/images/icons/accept.png");
 
	background-repeat: no-repeat;
 
	background-position: 3px 3px;
 
	border: 1px solid #C6D880;
 
}
 
 
/*
 
	content / right / forms / textarea (tinymce editor)
 
*/
 
#content div.box div.form div.fields div.field div.textarea table {
 
	margin: 0;
 
	padding: 0;
 
	width: 100%;
 
	border: none;
 
}
 
 
#content div.box div.form div.fields div.field div.textarea table td {
 
	padding: 0;
 
	background: #DDDDDD;
 
	border: none;
 
}
 
 
#content div.box div.form div.fields div.field div.textarea table td table
 
	{
 
	margin: 0;
 
	padding: 0;
 
	width: auto;
 
	border: none;
 
}
 
 
#content div.box div.form div.fields div.field div.textarea table td table td
 
	{
 
	padding: 5px 5px 5px 0;
 
	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 
		Lucida Sans Unicode, Arial, sans-serif;
 
	font-size: 11px;
 
}
 
 
#content div.box div.form div.fields div.field div.textarea table td table td a
 
	{
 
	border: none;
 
}
 
 
#content div.box div.form div.fields div.field div.textarea table td table td a.mceButtonActive
 
	{
 
	background: #b1b1b1;
 
}
 
 
/*
 
	content / right / forms / select
 
*/
 
#content div.box div.form div.fields div.field div.select {
 
	margin: 0 0 0 200px;
 
	padding: 0;
 
}
 
 
#content div.box div.form div.fields div.field div.select a:hover {
 
	color: #000000;
 
	text-decoration: none;
 
}
 
 
#content div.box div.form div.fields div.field div.select select {
 
	margin: 0;
 
}
 
 
/*
 
	content / right / forms / select (jquery styling)
 
*/
 
#content div.box div.form div.fields div.field div.select a.ui-selectmenu-focus
 
	{
 
	border: 1px solid #666666;
 
}
 
 
#content div.box div.form div.fields div.field div.select a.ui-selectmenu
 
	{
 
	color: #565656;
 
	text-decoration: none;
 
}
 
 
#content div.box div.form div.fields div.field div.select a.ui-selectmenu:hover
 
	{
 
	color: #000000;
 
	text-decoration: none;
 
}
 
 
#content div.box div.form div.fields div.field div.select a.ui-selectmenu-focus span.ui-icon
 
	{
 
	background-image: url(../images/ui/ui-icons_222222_256x240.png);
 
}
 
 
/*
 
	content / right / forms / element focus
 
*/
 
#content div.box div.form div.fields div.field input[type=text]:focus,#content div.box div.form div.fields div.field input[type=password]:focus,#content div.box div.form div.fields div.field input[type=file]:focus,#content div.box div.form div.fields div.field textarea:focus,#content div.box div.form div.fields div.field select:focus
 
	{
 
	background: #f6f6f6;
 
	border-color: #666;
 
}
 
 
/*
 
	content / right / forms / checkboxes
 
*/
 
#content div.box div.form div.fields div.field div.checkboxes {
 
	margin: 0 0 0 200px;
 
	padding: 0;
 
}
 
 
#content div.box div.form div.fields div.field div.checkboxes div.checkbox
 
	{
 
	margin: 0;
 
	padding: 2px 0 2px 0;
 
	clear: both;
 
	overflow: hidden;
 
}
 
 
#content div.box div.form div.fields div.field div.checkboxes div.checkbox input
 
	{
 
	margin: 0;
 
	float: left;
 
}
 
 
#content div.box div.form div.fields div.field div.checkboxes div.checkbox label
 
	{
 
	margin: 3px 0 0 4px;
 
	height: 1%;
 
	display: block;
 
	float: left;
 
}
 
 
/*
 
	content / right / forms / radios
 
*/
 
#content div.box div.form div.fields div.field div.radios {
 
	margin: 0 0 0 200px;
 
	padding: 0;
 
}
 
 
#content div.box div.form div.fields div.field div.radios div.radio {
 
	margin: 0;
 
	padding: 2px 0 2px 0;
 
	clear: both;
 
	overflow: hidden;
 
}
 
 
#content div.box div.form div.fields div.field div.radios div.radio input
 
	{
 
	margin: 0;
 
	float: left;
 
}
 
 
#content div.box div.form div.fields div.field div.radios div.radio label
 
	{
 
	margin: 3px 0 0 4px;
 
	height: 1%;
 
	display: block;
 
	float: left;
 
}
 
 
/*
 
	content / right / forms / button
 
*/
 
div.form div.fields div.field div.button {
 
	margin: 0;
 
	padding: 0 0 0 8px;
 
	float: left;
 
}
 
 
div.form div.fields div.field div.button input {
 
	margin: 0;
 
	color: #000000;
 
	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 
		Lucida Sans Unicode, Arial, sans-serif;
 
	font-size: 11px;
 
	font-weight: bold;
 
}
 
 
div.form div.fields div.field div.button .ui-state-default {
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #e5e3e3 url("../images/button.png") repeat-x;
 
	border-top: 1px solid #DDDDDD;
 
	border-left: 1px solid #c6c6c6;
 
	border-right: 1px solid #DDDDDD;
 
	border-bottom: 1px solid #c6c6c6;
 
	color: #515151;
 
	outline: none;
 
}
 
 
div.form div.fields div.field div.button .ui-state-hover {
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #b4b4b4 url("../images/button_selected.png") repeat-x;
 
	border-top: 1px solid #cccccc;
 
	border-left: 1px solid #bebebe;
 
	border-right: 1px solid #b1b1b1;
 
	border-bottom: 1px solid #afafaf;
 
	color: #515151;
 
	outline: none;
 
}
 
 
div.form div.fields div.field div.highlight {
 
	display: inline;
 
}
 
 
div.form div.fields div.field div.highlight .ui-state-default {
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #4e85bb url("../images/button_highlight.png") repeat-x;
 
	border-top: 1px solid #5c91a4;
 
	border-left: 1px solid #2a6f89;
 
	border-right: 1px solid #2b7089;
 
	border-bottom: 1px solid #1a6480;
 
	color: #FFFFFF;
 
}
 
 
div.form div.fields div.field div.highlight .ui-state-hover {
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #46a0c1 url("../images/button_highlight_selected.png")
 
		repeat-x;
 
	border-top: 1px solid #78acbf;
 
	border-left: 1px solid #34819e;
 
	border-right: 1px solid #35829f;
 
	border-bottom: 1px solid #257897;
 
	color: #FFFFFF;
 
}
 
 
/*
 
	content / right / forms / buttons
 
*/
 
#content div.box div.form div.fields div.buttons {
 
	margin: 10px 0 0 200px;
 
	padding: 0;
 
}
 
 
#content div.box-left div.form div.fields div.buttons,#content div.box-right div.form div.fields div.buttons
 
	{
 
	margin: 10px 0 0 0;
 
}
 
 
#content div.box div.form div.fields div.buttons input {
 
	margin: 0;
 
	color: #000000;
 
	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 
		Lucida Sans Unicode, Arial, sans-serif;
 
	font-size: 11px;
 
	font-weight: bold;
 
}
 
 
/*
 
	content / right / forms / buttons
 
*/
 
div.form div.fields div.buttons {
 
	margin: 10px 0 0 200px;
 
	padding: 0;
 
}
 
 
div.box-left div.form div.fields div.buttons,div.box-right div.form div.fields div.buttons
 
	{
 
	margin: 10px 0 0 0;
 
}
 
 
div.form div.fields div.buttons input {
 
	margin: 0;
 
	color: #000000;
 
	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 
		Lucida Sans Unicode, Arial, sans-serif;
 
	font-size: 11px;
 
	font-weight: bold;
 
}
 
 
/*
 
	content / right / forms / buttons (jquery styling)
 
*/
 
#content div.box div.form div.fields div.buttons input.ui-state-default
 
	{
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #e5e3e3 url("../images/button.png") repeat-x;
 
	border-top: 1px solid #DDDDDD;
 
	border-left: 1px solid #c6c6c6;
 
	border-right: 1px solid #DDDDDD;
 
	border-bottom: 1px solid #c6c6c6;
 
	color: #515151;
 
	outline: none;
 
}
 
 
#content div.box div.form div.fields div.buttons input.ui-state-hover {
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #b4b4b4 url("../images/button_selected.png") repeat-x;
 
	border-top: 1px solid #cccccc;
 
	border-left: 1px solid #bebebe;
 
	border-right: 1px solid #b1b1b1;
 
	border-bottom: 1px solid #afafaf;
 
	color: #515151;
 
	outline: none;
 
}
 
 
#content div.box div.form div.fields div.buttons div.highlight {
 
	display: inline;
 
}
 
 
#content div.box div.form div.fields div.buttons div.highlight input.ui-state-default
 
	{
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #4e85bb url("../images/button_highlight.png") repeat-x;
 
	border-top: 1px solid #5c91a4;
 
	border-left: 1px solid #2a6f89;
 
	border-right: 1px solid #2b7089;
 
	border-bottom: 1px solid #1a6480;
 
	color: #FFFFFF;
 
}
 
 
#content div.box div.form div.fields div.buttons div.highlight input.ui-state-hover
 
	{
 
	margin: 0;
 
	padding: 6px 12px 6px 12px;
 
	background: #46a0c1 url("../images/button_highlight_selected.png")
 
		repeat-x;
 
	border-top: 1px solid #78acbf;
 
	border-left: 1px solid #34819e;
 
	border-right: 1px solid #35829f;
 
	border-bottom: 1px solid #257897;
 
	color: #FFFFFF;
 
}
 
 
/*
 
	content / right / box / tables
 
*/
 
#content div.box div.table {
 
	margin: 0;
 
	padding: 0 20px 10px 20px;
 
	clear: both;
 
	overflow: hidden;
 
}
 
 
#content div.box table {
 
	margin: 0;
 
	padding: 0;
 
	width: 100%;
 
	border-collapse: collapse;
 
}
 
 
#content div.box table th {
 
	padding: 10px;
 
	background: #eeeeee;
 
	border-bottom: 1px solid #dddddd;
 
}
 
 
#content div.box table th.left {
 
	text-align: left;
 
}
 
 
#content div.box table th.right {
 
	text-align: right;
rhodecode/templates/admin/users/user_add.html
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%inherit file="/base/base.html"/>
 

	
 
<%def name="title()">
 
    ${_('User administration')}
 
</%def>
 
<%def name="breadcrumbs_links()">
 
    ${h.link_to(_('Admin'),h.url('admin_home'))} 
 
    &raquo; 
 
    ${h.link_to(_('Users'),h.url('users'))} 
 
    &raquo;
 
    ${_('add new user')}
 
</%def>
 

	
 
<%def name="page_nav()">
 
	${self.menu('admin')}
 
</%def>
 

	
 
<%def name="main()">
 
<div class="box">
 
    <!-- box / title -->
 
    <div class="title">
 
        ${self.breadcrumbs()}       
 
    </div>
 
    <!-- end box / title -->
 
    ${h.form(url('users'))}
 
    <div class="form">
 
        <!-- fields -->
 
        <div class="fields">
 
             <div class="field">
 
                <div class="label">
 
                    <label for="username">${_('Username')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('username')}
 
                    ${h.text('username',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="password">${_('Password')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.password('password')}
 
                    ${h.password('password',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="name">${_('Name')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('name')}
 
                    ${h.text('name',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="lastname">${_('Lastname')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('lastname')}
 
                    ${h.text('lastname',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="email">${_('Email')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('email')}
 
                    ${h.text('email',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label label-checkbox">
 
                    <label for="active">${_('Active')}:</label>
 
                </div>
 
                <div class="checkboxes">
 
                    ${h.checkbox('active',value=True)}
 
                </div>
 
             </div>
 
            
 
            <div class="buttons">
 
              ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 
            </div>             
 
    	</div>
 
    </div>
 
    ${h.end_form()}
 
</div>    
 
</%def>    
 
\ No newline at end of file
rhodecode/templates/admin/users/user_edit.html
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%inherit file="/base/base.html"/>
 

	
 
<%def name="title()">
 
    ${_('User administration')}
 
</%def>
 

	
 
<%def name="breadcrumbs_links()">
 
    ${h.link_to(_('Admin'),h.url('admin_home'))} 
 
    &raquo; 
 
    ${h.link_to(_('Users'),h.url('users'))} 
 
    &raquo;
 
    ${_('edit')} "${c.user.username}"
 
</%def>
 

	
 
<%def name="page_nav()">
 
	${self.menu('admin')}
 
</%def>
 

	
 
<%def name="main()">
 
<div class="box">
 
    <!-- box / title -->
 
    <div class="title">
 
        ${self.breadcrumbs()}       
 
    </div>
 
    <!-- end box / title -->
 
    ${h.form(url('user', id=c.user.user_id),method='put')}
 
    <div class="form">
 
        <!-- fields -->
 
        <div class="fields">
 
             <div class="field">
 
                <div class="gravatar_box">
 
              		<div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
 
              		<p>
 
              		<strong>Change your avatar at <a href="http://gravatar.com">gravatar.com</a></strong><br/> 
 
              		${_('Using')} ${c.user.email}
 
              		</p>
 
            	</div>
 
             </div>        
 
        
 
             <div class="field">
 
                <div class="label">
 
                    <label for="username">${_('Username')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('username')}
 
                    ${h.text('username',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="new_password">${_('New password')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.password('new_password')}
 
                    ${h.password('new_password',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="name">${_('Name')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('name')}
 
                    ${h.text('name',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="lastname">${_('Lastname')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('lastname')}
 
                    ${h.text('lastname',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label">
 
                    <label for="email">${_('Email')}:</label>
 
                </div>
 
                <div class="input">
 
                    ${h.text('email')}
 
                    ${h.text('email',class_='small')}
 
                </div>
 
             </div>
 
            
 
             <div class="field">
 
                <div class="label label-checkbox">
 
                    <label for="active">${_('Active')}:</label>
 
                </div>
 
                <div class="checkboxes">
 
                    ${h.checkbox('active',value=True)}
 
                </div>
 
             </div>
 
             
 
             <div class="field">
 
                <div class="label label-checkbox">
 
                    <label for="admin">${_('Admin')}:</label>
 
                </div>
 
                <div class="checkboxes">
 
                    ${h.checkbox('admin',value=True)}
 
                </div>
 
             </div>             
 
            <div class="buttons">
 
              ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
 
            </div>             
 
    	</div>    
 
    </div>
 
    ${h.end_form()}
 
</div>    
 
</%def>  
 
\ No newline at end of file
rhodecode/templates/search/search.html
Show inline comments
 
## -*- coding: utf-8 -*-
 
<%inherit file="/base/base.html"/>
 
<%def name="title()">
 
   ${_('Search')} 
 
	%if c.repo_name:
 
		${_('in repository: ') + c.repo_name}
 
	%else:
 
		${_('in all repositories')}		
 
	%endif
 
	:${c.cur_query}
 
</%def>
 
<%def name="breadcrumbs()">
 
	${c.rhodecode_name}
 
</%def>
 
<%def name="page_nav()">
 
	${self.menu('home')}
 
</%def>
 
<%def name="main()">
 

	
 
<div class="box">
 
	<!-- box / title -->
 
	<div class="title">
 
		<h5>${_('Search')}
 
		%if c.repo_name:
 
			${_('in repository: ') + c.repo_name}
 
		%else:
 
			${_('in all repositories')}
 
		%endif		
 
		</h5>
 
	</div>
 
	<!-- end box / title -->
 
	%if c.repo_name:
 
		${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')}	
 
	%else:
 
		${h.form(h.url('search'),method='get')}
 
	%endif
 
	<div class="form">
 
		<div class="fields">
 
			<div class="field field-first field-noborder">
 
             <div class="label">
 
                 <label for="q">${_('Search term')}</label>
 
             </div> 			
 
				<div class="input">${h.text('q',c.cur_query,class_="small")}</div>
 
				<div class="input">${h.text('q',c.cur_query,class_="small")}
 
				<div class="button highlight">
 
					<input type="submit" value="${_('Search')}" class="ui-button ui-widget ui-state-default ui-corner-all"/>
 
				</div>
 
				</div>
 
				<div style="font-weight: bold;clear:Both;margin-left:200px">${c.runtime}</div>		
 
			</div>
 

	
 
			<div class="field">
 
	            <div class="label">
 
	                <label for="type">${_('Search in')}</label>
 
	            </div>
 
                <div class="select">
 
                    ${h.select('type',c.cur_type,[('content',_('Source codes')),
 
                        ##('commit',_('Commit messages')),
 
                        ('path',_('File names')),
 
                        ##('repository',_('Repository names')),
 
                        ])} 
 
                </div>
 
             </div>
 
			             
 
		</div>
 
	</div>
 
	${h.end_form()}
 
	
 
    %if c.cur_search == 'content':
 
        <%include file='search_content.html'/>
 
    %elif c.cur_search == 'path':
 
        <%include file='search_path.html'/>
 
    %elif c.cur_search == 'commit':
 
        <%include file='search_commit.html'/>
 
    %elif c.cur_search == 'repository':
 
        <%include file='search_repository.html'/>
 
    %endif                            
 
</div>
 

	
 
</%def>    
0 comments (0 inline, 0 general)