kallithea Changeset - 136ad719d9e2

Changeset - 136ad719d9e2

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 15 years ago 2010-10-11 01:47:43
marcin@python-works.com

fixed bug when autocomplete could not display names (hidden by div)
fixed repo switch autostrech bug
some other tweeks for templates

4 files changed with 8 insertions and 11 deletions:

rhodecode/public/css/style.css

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/admin/repos/repos.html

rhodecode/templates/admin/users/users.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -382,199 +382,199 @@ div.options a:hover { @@
 	display: block;
 	float: left;
 	background: url("../../resources/images/quick_r.png") no-repeat top
 		right;
 	border-left: 1px solid #3f6f9f;
+}
 #header #header-inner #quick li span.normal {
 	padding: 10px 12px 8px 12px;
 	border: none;
+}
 #header #header-inner #quick li span.icon {
 	top: 0;
 	left: 0;
 	padding: 8px 8px 4px 8px;
 	background: url("../../resources/images/quick_l.png") no-repeat top left;
 	border-left: none;
 	border-right: 1px solid #2e5c89;
+}
 #header #header-inner #quick li a:hover {
 	background: #4e4e4e url("../../resources/images/quick_l_selected.png")
 		no-repeat top left;
+}
 #header #header-inner #quick li a:hover span {
 	background: url("../../resources/images/quick_r_selected.png") no-repeat
 		top right;
 	border-left: 1px solid #545454;
+}
 #header #header-inner #quick li a:hover span.normal {
 	border: none;
+}
 #header #header-inner #quick li a:hover span.icon {
 	background: url("../../resources/images/quick_l_selected.png") no-repeat
 		top left;
 	border-left: none;
 	border-right: 1px solid #464646;
+}
 #header #header-inner #quick ul {
 	top: 29px;
 	right: 0;
 	margin: 0;
 	padding: 0;
 	width: 200px;
+	min-width: 200px;
 	display: none;
 	position: absolute;
 	background: #FFFFFF;
 	border: 1px solid #666;
 	border-top: 1px solid #003367;
 	z-index: 100;
+}
 #header #header-inner #quick ul.repo_switcher {
 	max-height: 275px;
 	overflow-x: hidden;
 	overflow-y: auto;
 	white-space: nowrap;
+}
 #header #header-inner #quick li ul li {
 	border-bottom: 1px solid #dddddd;
+}
 #header #header-inner #quick li ul li.last {
 	border: none;
+}
 #header #header-inner #quick li ul li a {
 	margin: 0;
 	padding: 7px 9px 7px 9px;
 	height: 1%;
 	width: 182px;
 	height: auto;
 	display: block;
 	float: left;
 	background: #FFFFFF;
 	color: #003367;
 	font-weight: normal;
+}
 #header #header-inner #quick li ul li a.childs {
 	margin: 0;
 	padding: 7px 9px 7px 24px;
 	width: 167px;
 	background: #FFFFFF url("../../resources/images/plus.png") no-repeat 8px
 px;
+}
 #header #header-inner #quick li ul li a:hover {
 	color: #000000;
 	background: #FFFFFF;
+}
 #header #header-inner #quick li ul li a.childs:hover {
 	background: #FFFFFF url("../../resources/images/minus.png") no-repeat
 px 9px;
+}
 #header #header-inner #quick ul ul {
 	top: auto;
+}
 #header #header-inner #quick li ul ul {
 	right: 200px;
 	max-height: 275px;
 	overflow: auto;
 	overflow-x: hidden;
 	white-space: nowrap;
+}
 #header #header-inner #quick li:hover ul ul,#header #header-inner #quick li:hover ul ul ul,#header #header-inner #quick li:hover ul ul ul ul
+	{
 	display: none;
+}
 #header #header-inner #quick li:hover ul,#header #header-inner #quick li li:hover ul,#header #header-inner #quick li li li:hover ul,#header #header-inner #quick li li li li:hover ul
+	{
 	display: block;
+}
 /*ICONS*/
 #header #header-inner #quick li ul li a.journal,#header #header-inner #quick li ul li a.journal:hover
+	{
 	background: url("../images/icons/book.png") no-repeat scroll 4px 9px
 		#FFFFFF;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+}
 #header #header-inner #quick li ul li a.private_repo,#header #header-inner #quick li ul li a.private_repo:hover
+	{
 	background: url("../images/icons/lock.png") no-repeat scroll 4px 9px
 		#FFFFFF;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+	min-width: 167px;
+}
 #header #header-inner #quick li ul li a.public_repo,#header #header-inner #quick li ul li a.public_repo:hover
+	{
 	background: url("../images/icons/lock_open.png") no-repeat scroll 4px
 px #FFFFFF;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+	min-width: 167px;
+}
 #header #header-inner #quick li ul li a.repos,#header #header-inner #quick li ul li a.repos:hover
+	{
 	background: url("../images/icons/folder_edit.png") no-repeat scroll 4px
 px #FFFFFF;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+}
 #header #header-inner #quick li ul li a.users,#header #header-inner #quick li ul li a.users:hover
+	{
 	background: #FFFFFF url("../images/icons/user_edit.png") no-repeat 4px
 px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+}
 #header #header-inner #quick li ul li a.settings,#header #header-inner #quick li ul li a.settings:hover
+	{
 	background: #FFFFFF url("../images/icons/cog.png") no-repeat 4px 9px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+}
 #header #header-inner #quick li ul li a.permissions,#header #header-inner #quick li ul li a.permissions:hover
+	{
 	background: #FFFFFF url("../images/icons/key.png") no-repeat 4px 9px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+}
 #header #header-inner #quick li ul li a.fork,#header #header-inner #quick li ul li a.fork:hover
+	{
 	background: #FFFFFF url("../images/icons/arrow_divide.png") no-repeat
 px 9px;
 	margin: 0;
 	padding: 12px 9px 7px 24px;
 	width: 167px;
+}
 #header #header-inner #quick li ul li a.search,#header #header-inner #quick li ul li a.search:hover
+	{
 	background: #FFFFFF url("../images/icons/search_16.png") no-repeat 4px
@@ @@ -1142,232 +1142,229 @@ div.options a:hover { @@
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #8FBDE0;
 	border: 1px solid #6BACDE;
 	color: #003863;
+}
 #content div.box div.message-notice h6 {
 	color: #003863;
+}
 #content div.box div.message-success {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #E6EFC2;
 	border: 1px solid #C6D880;
 	color: #4e6100;
+}
 #content div.box div.message-success h6 {
 	color: #4e6100;
+}
 /*
 	content / right / box / forms
 */
 #content div.box div.form {
 	margin: 0;
 	padding: 0 20px 10px 20px;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.form div.fields {
 	margin: 0;
 	padding: 0;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.form div.fields div.field {
 	margin: 0;
 	padding: 10px 0 10px 0;
 	height: 1%;
 	border-bottom: 1px solid #DDDDDD;
 	clear: both;
 	overflow: hidden;
+}
 #content div.box div.form div.fields div.field-first {
 	padding: 0 0 10px 0;
+}
 #content div.box div.form div.fields div.field-noborder {
 	border-bottom: 0px !important;
+}
 #content div.box div.form div.fields div.field span.error-message {
-	margin: 8px 0 0 0;
+	margin: 8px 0px 0px 4px;
 	padding: 0;
 	height: 1%;
 	display: block;
+	display: inline-block;
 	color: #FF0000;
+}
 #content div.box div.form div.fields div.field span.success {
 	margin: 8px 0 0 0;
 	padding: 0;
 	height: 1%;
 	display: block;
 	color: #316309;
+}
 /*
 	content / right / forms / labels
 */
 #content div.box div.form div.fields div.field div.label {
 	left: 310px;
 	margin: 0;
 	padding: 8px 0 0 5px;
 	width: auto;
 	position: absolute;
+}
 #content div.box-left div.form div.fields div.field div.label,#content div.box-right div.form div.fields div.field div.label
+	{
 	left: 0;
 	margin: 0;
 	padding: 0 0 8px 0;
 	width: auto;
 	position: relative;
 	clear: both;
 	overflow: hidden;
+}
 /*
 	content / right / forms / label (select)
 */
 #content div.box div.form div.fields div.field div.label-select {
 	padding: 2px 0 0 5px;
+}
 #content div.box-left div.form div.fields div.field div.label-select,#content div.box-right div.form div.fields div.field div.label-select
+	{
 	padding: 0 0 8px 0;
+}
 /*
 	content / right / forms / label (checkbox)
 */
 #content div.box div.form div.fields div.field div.label-checkbox {
 	padding: 0 0 0 5px !important;
+}
 /*
 	content / right / forms / label (radio)
 */
 #content div.box div.form div.fields div.field div.label-radio {
 	padding: 0 0 0 5px !important;
+}
 /*
 	content / right / forms / label (textarea)
 */
 #content div.box div.form div.fields div.field div.label-textarea {
 	padding: 0 0 0 5px !important;
+}
 #content div.box-left div.form div.fields div.field div.label-textarea,#content div.box-right div.form div.fields div.field div.label-textarea
+	{
 	padding: 0 0 8px 0 !important;
+}
 /*
 	content / right / forms / labels (label)
 */
 #content div.box div.form div.fields div.field div.label label {
 	color: #393939;
 	font-weight: bold;
+}
 #content div.box div.form div.fields div.field div.label span {
 	margin: 0;
 	padding: 2px 0 0 0;
 	height: 1%;
 	display: block;
 	color: #363636;
+}
 /*
 	content / right / forms / input
 */
 #content div.box div.form div.fields div.field div.input {
 	margin: 0 0 0 200px;
 	padding: 0;
+}
 #content div.box-left div.form div.fields div.field div.input,#content div.box-right div.form div.fields div.field div.input
+	{
 	margin: 0;
 	padding: 7px 7px 6px 7px;
 	clear: both;
 	overflow: hidden;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
+}
 #content div.box div.form div.fields div.field div.input input {
 	margin: 0;
 	padding: 7px 7px 6px 7px;
 	background: #FFFFFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000000;
 	font-family: Lucida Grande, Verdana, Lucida Sans Regular,
 		Lucida Sans Unicode, Arial, sans-serif;
 	font-size: 11px;
 	float: left;
+}
 #content div.box-left div.form div.fields div.field div.input input,#content div.box-right div.form div.fields div.field div.input input
+	{
 	width: 100%;
 	padding: 0;
 	border: none;
+}
 #content div.box div.form div.fields div.field div.input input.small {
 	width: 30%;
+}
 #content div.box div.form div.fields div.field div.input input.medium {
 	width: 55%;
+}
 #content div.box div.form div.fields div.field div.input input.large {
 	width: 85%;
+}
 #content div.box div.form div.fields div.field div.input input.date {
 	width: 177px;
+}
 #content div.box div.form div.fields div.field div.input input.button {
 	margin: 0;
 	padding: 4px 8px 4px 8px;
 	background: #D4D0C8;
 	border-top: 1px solid #FFFFFF;
 	border-left: 1px solid #FFFFFF;
 	border-right: 1px solid #404040;
 	border-bottom: 1px solid #404040;
 	color: #000000;
+}
 #content div.box div.form div.fields div.field div.input input.error {
 	background: #FBE3E4;
 	border-top: 1px solid #e1b2b3;
 	border-left: 1px solid #e1b2b3;
 	border-right: 1px solid #FBC2C4;
 	border-bottom: 1px solid #FBC2C4;
+}
 #content div.box div.form div.fields div.field div.input input.success {
 	background: #E6EFC2;
 	border-top: 1px solid #cebb98;
 	border-left: 1px solid #cebb98;

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -10,97 +10,97 @@ @@
     &raquo;
     ${h.link_to(_('Repositories'),h.url('repos'))}
     &raquo;
     ${_('edit')} "${c.repo_name}"
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input input-medium">
                     ${h.text('repo_name',class_="small")}
                 </div>
              </div>
             <div class="field">
                 <div class="label label-textarea">
                     <label for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
             <div class="field">
-                <div class="label label-checkbox">
                 <div class="label">
                     <label for="user">${_('Owner')}:</label>
                 </div>
                 <div class="input input-small ac">
                     <div class="perm_ac">
                        ${h.text('user',class_='yui-ac-input')}
                        <div id="owner_container"></div>
                     </div>
                 </div>
              </div>
             <div class="field">
                 <div class="label">
                     <label for="input">${_('Permissions')}:</label>
                 </div>
                 <div class="input">
                     <table id="permissions_manage">
                         <tr>
                             <td>${_('none')}</td>
                             <td>${_('read')}</td>
                             <td>${_('write')}</td>
                             <td>${_('admin')}</td>
                             <td>${_('user')}</td>
                             <td></td>
                         </tr>
                         %for r2p in c.repo_info.repo_to_perm:
                             %if r2p.user.username =='default' and c.repo_info.private:
                                 <tr>
                                     <td colspan="4">
                                         <span class="private_repo_msg">
                                         ${_('private repository')}
                                         </span>
                                     </td>
                                     <td class="private_repo_msg">${r2p.user.username}</td>
                                 </tr>
                             %else:
                             <tr id="id${id(r2p.user.username)}">
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.none')}</td>
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.read')}</td>
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.write')}</td>
                                 <td>${h.radio('perm_%s' % r2p.user.username,'repository.admin')}</td>
                                 <td>${r2p.user.username}</td>
                                 <td>
                                   %if r2p.user.username !='default':
                                     <span class="delete_icon action_button" onclick="ajaxAction(${r2p.user.user_id},'${'id%s'%id(r2p.user.username)}')">
                                         <script type="text/javascript">
                                             function ajaxAction(user_id,field_id){
                                                 var sUrl = "${h.url('delete_repo_user',repo_name=c.repo_name)}";

rhodecode/templates/admin/repos/repos.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Repositories administration')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; ${_('Repositories')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
-            <span>${h.link_to(u'ADD NEW REPOSITORY',h.url('new_repo'),class_="add_icon")}</span>
             <span>${h.link_to(u'ADD NEW REPOSITORY',h.url('new_repo'))}</span>
           </li>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">
         <table class="table_disp">
         <tr class="header">
 	        <th class="left">${_('Name')}</th>
 	        <th class="left">${_('Description')}</th>
 	        <th class="left">${_('Last change')}</th>
 	        <th class="left">${_('Tip')}</th>
 	        <th class="left">${_('Contact')}</th>
             <th class="left">${_('action')}</th>
         </tr>
             %for cnt,repo in enumerate(c.repos_list):
             <tr class="parity${cnt%2}">
                  <td>
                  %if repo['repo'].dbrepo.private:
                     <img alt="${_('private')}" src="/images/icons/lock.png"/>
                  %else:
                     <img alt="${_('public')}" src="/images/icons/lock_open.png"/>
                  %endif
                 ${h.link_to(repo['name'],h.url('edit_repo',repo_name=repo['name']))}
 	            %if repo['repo'].dbrepo.fork:
 	            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 	            	<img class="icon" alt="${_('public')}"
 	            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}"
 	            	src="/images/icons/arrow_divide.png"/></a>
 	            %endif
                 </td>
 				<td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
 	            <td>${h.age(repo['last_change'])}</td>
 	            <td>
 	            	%if repo['rev']>=0:
 	            	${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),
 	                h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']),
 	                class_="tooltip",
 	                tooltip_title=h.tooltip(repo['last_msg']))}
 	            	%else:
 	            		${_('No changesets yet')}
 	            	%endif
 	            </td>
 	            <td title="${repo['contact']}">${h.person(repo['contact'])}</td>
                 <td>
                   ${h.form(url('repo', repo_name=repo['name']),method='delete')}
                     ${h.submit('remove_%s' % repo['name'],'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
                   ${h.end_form()}

rhodecode/templates/admin/users/users.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Users administration')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; ${_('Users')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
-            <span>${h.link_to(u'ADD NEW USER',h.url('new_user'),class_="add_icon")}</span>
             <span>${h.link_to(u'ADD NEW USER',h.url('new_user'))}</span>
           </li>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">
         <table class="table_disp">
         <tr class="header">
         	<th></th>
             <th class="left">${_('username')}</th>
             <th class="left">${_('name')}</th>
             <th class="left">${_('lastname')}</th>
             <th class="left">${_('active')}</th>
             <th class="left">${_('admin')}</th>
             <th class="left">${_('action')}</th>
         </tr>
             %for cnt,user in enumerate(c.users_list):
              %if user.name !='default':
                 <tr class="parity${cnt%2}">
                 	<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"> </div></td>
                     <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td>
                     <td>${user.name}</td>
                     <td>${user.lastname}</td>
                     <td>${user.active}</td>
                     <td>${user.admin}</td>
                     <td>
                         ${h.form(url('user', id=user.user_id),method='delete')}
                             ${h.submit('remove','delete',class_="delete_icon action_button")}
                         ${h.end_form()}
                     </td>
                 </tr>
              %endif
             %endfor
         </table>
     </div>
 </div>
 </%def>

0 comments (0 inline, 0 general)