kallithea Changeset - 79183c1321da

Changeset - 79183c1321da

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 14 years ago 2012-01-17 19:40:36
marcin@python-works.com

marked ldap_dn in user edit form as readonly ref #292

2 files changed with 25 insertions and 22 deletions:

rhodecode/public/css/style.css

rhodecode/templates/admin/users/user_edit.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -594,768 +594,771 @@ padding:12px 9px 7px 24px; @@
 	position: absolute;
 	background-color:#FFF;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #003367 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid;
     border-width: 1px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
 .quick_repo_menu .menu_items li{
     padding:0 !important;
+}
 .quick_repo_menu .menu_items a{
 	display: block;
 	padding: 4px 12px 4px 8px;
+}
 .quick_repo_menu .menu_items a:hover{
     background-color: #EEE;
     text-decoration: none;
+}
 .quick_repo_menu .menu_items .icon img{
 	margin-bottom:-2px;
+}
 .quick_repo_menu .menu_items.hidden{
 	display: none;
+}
 #content #left {
 left:0;
 width:280px;
 position:absolute;
+}
 #content #right {
 margin:0 60px 10px 290px;
+}
 #content div.box {
 clear:both;
 overflow:hidden;
 background:#fff;
 margin:0 0 10px;
 padding:0 0 10px;
 -webkit-border-radius: 4px 4px 4px 4px;
 -khtml-border-radius: 4px 4px 4px 4px;
 -moz-border-radius: 4px 4px 4px 4px;
 border-radius: 4px 4px 4px 4px;
 box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #content div.box-left {
 width:49%;
 clear:none;
 float:left;
 margin:0 0 10px;
+}
 #content div.box-right {
 width:49%;
 clear:none;
 float:right;
 margin:0 0 10px;
+}
 #content div.box div.title {
 clear:both;
 overflow:hidden;
 background:#369 url("../images/header_inner.png") repeat-x;
 margin:0 0 20px;
 padding:0;
+}
 #content div.box div.title h5 {
 float:left;
 border:none;
 color:#fff;
 text-transform:uppercase;
 margin:0;
 padding:11px 0 11px 10px;
+}
 #content div.box div.title ul.links li {
 list-style:none;
 float:left;
 margin:0;
 padding:0;
+}
 #content div.box div.title ul.links li a {
     border-left: 1px solid #316293;
     color: #FFFFFF;
     display: block;
     float: left;
     font-size: 13px;
     font-weight: 700;
     height: 1%;
     margin: 0;
     padding: 11px 22px 12px;
     text-decoration: none;
+}
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6 {
 clear:both;
 overflow:hidden;
 border-bottom:1px solid #DDD;
 margin:10px 20px;
 padding:0 0 15px;
+}
 #content div.box p {
 color:#5f5f5f;
 font-size:12px;
 line-height:150%;
 margin:0 24px 10px;
 padding:0;
+}
 #content div.box blockquote {
 border-left:4px solid #DDD;
 color:#5f5f5f;
 font-size:11px;
 line-height:150%;
 margin:0 34px;
 padding:0 0 0 14px;
+}
 #content div.box blockquote p {
 margin:10px 0;
 padding:0;
+}
 #content div.box dl {
 margin:10px 24px;
+}
 #content div.box dt {
 font-size:12px;
 margin:0;
+}
 #content div.box dd {
 font-size:12px;
 margin:0;
 padding:8px 0 8px 15px;
+}
 #content div.box li {
 font-size:12px;
 padding:4px 0;
+}
 #content div.box ul.disc,#content div.box ul.circle {
 margin:10px 24px 10px 38px;
+}
 #content div.box ul.square {
 margin:10px 24px 10px 40px;
+}
 #content div.box img.left {
 border:none;
 float:left;
 margin:10px 10px 10px 0;
+}
 #content div.box img.right {
 border:none;
 float:right;
 margin:10px 0 10px 10px;
+}
 #content div.box div.messages {
 clear:both;
 overflow:hidden;
 margin:0 20px;
 padding:0;
+}
 #content div.box div.message {
 clear:both;
 overflow:hidden;
 margin:0;
 padding:10px 0;
+}
 #content div.box div.message a {
 font-weight:400 !important;
+}
 #content div.box div.message div.image {
 float:left;
 margin:9px 0 0 5px;
 padding:6px;
+}
 #content div.box div.message div.image img {
 vertical-align:middle;
 margin:0;
+}
 #content div.box div.message div.text {
 float:left;
 margin:0;
 padding:9px 6px;
+}
 #content div.box div.message div.dismiss a {
 height:16px;
 width:16px;
 display:block;
 background:url("../images/icons/cross.png") no-repeat;
 margin:15px 14px 0 0;
 padding:0;
+}
 #content div.box div.message div.text h1,#content div.box div.message div.text h2,#content div.box div.message div.text h3,#content div.box div.message div.text h4,#content div.box div.message div.text h5,#content div.box div.message div.text h6 {
 border:none;
 margin:0;
 padding:0;
+}
 #content div.box div.message div.text span {
 height:1%;
 display:block;
 margin:0;
 padding:5px 0 0;
+}
 #content div.box div.message-error {
 height:1%;
 clear:both;
 overflow:hidden;
 background:#FBE3E4;
 border:1px solid #FBC2C4;
 color:#860006;
+}
 #content div.box div.message-error h6 {
 color:#860006;
+}
 #content div.box div.message-warning {
 height:1%;
 clear:both;
 overflow:hidden;
 background:#FFF6BF;
 border:1px solid #FFD324;
 color:#5f5200;
+}
 #content div.box div.message-warning h6 {
 color:#5f5200;
+}
 #content div.box div.message-notice {
 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 div.box div.form div.fields div.field {
 height:1%;
 border-bottom:1px solid #DDD;
 clear:both;
 margin:0;
 padding:10px 0;
+}
 #content div.box div.form div.fields div.field-first {
 padding:0 0 10px;
+}
 #content div.box div.form div.fields div.field-noborder {
 border-bottom:0 !important;
+}
 #content div.box div.form div.fields div.field span.error-message {
 height:1%;
 display:inline-block;
 color:red;
 margin:8px 0 0 4px;
 padding:0;
+}
 #content div.box div.form div.fields div.field span.success {
 height:1%;
 display:block;
 color:#316309;
 margin:8px 0 0;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.label {
 left:70px;
 width:155px;
 position:absolute;
 margin:0;
 padding:8px 0 0 5px;
+}
 #content div.box-left div.form div.fields div.field div.label,#content div.box-right div.form div.fields div.field div.label {
 clear:both;
 overflow:hidden;
 left:0;
 width:auto;
 position:relative;
 margin:0;
 padding:0 0 8px;
+}
 #content div.box div.form div.fields div.field div.label-select {
 padding:5px 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;
+}
 #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 !important;
+}
 #content div.box div.form div.fields div.field div.label label, div.label label{
 color:#393939;
 font-weight:700;
+}
 #content div.box div.form div.fields div.field div.input {
 margin:0 0 0 200px;
+}
 #content div.box div.form div.fields div.field div.file {
 margin:0 0 0 200px;
+}
 #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 0 0 0px;
+}
 #content div.box div.form div.fields div.field div.input input {
 background:#FFF;
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 color:#000;
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 margin:0;
 padding:7px 7px 6px;
+}
 #content div.box div.form div.fields div.field div.file input {
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3;
     border-style: solid;
     border-width: 1px;
     color: #000000;
     font-family: Lucida Grande,Verdana,Lucida Sans Regular,Lucida Sans Unicode,Arial,sans-serif;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 input.disabled {
     background-color: #F5F5F5 !important;
+}
 #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 {
 background:#D4D0C8;
 border-top:1px solid #FFF;
 border-left:1px solid #FFF;
 border-right:1px solid #404040;
 border-bottom:1px solid #404040;
 color:#000;
 margin:0;
 padding:4px 8px;
+}
 #content div.box div.form div.fields div.field div.textarea {
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
 border-right:1px solid #eaeaea;
 border-bottom:1px solid #eaeaea;
 margin:0 0 0 200px;
 padding:10px;
+}
 #content div.box div.form div.fields div.field div.textarea-editor {
 border:1px solid #ddd;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.textarea textarea {
 width:100%;
 height:220px;
 overflow:hidden;
 background:#FFF;
 color:#000;
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 outline:none;
 border-width:0;
 margin:0;
 padding:0;
+}
 #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 table {
 width:100%;
 border:none;
 margin:0;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.textarea table td {
 background:#DDD;
 border:none;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.textarea table td table {
 width:auto;
 border:none;
 margin:0;
 padding:0;
+}
 #content div.box div.form div.fields div.field div.textarea table td table td {
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 padding:5px 5px 5px 0;
+}
 #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;
+}
 div.form div.fields div.field div.button {
 margin:0;
 padding:0 0 0 8px;
+}
 #content div.box table {
 width:100%;
 border-collapse:collapse;
 margin:0;
 padding:0;
 border: 1px solid #eee;
+}
 #content div.box table th {
 background:#eee;
 border-bottom:1px solid #ddd;
 padding:5px 0px 5px 5px;
+}
 #content div.box table th.left {
 text-align:left;
+}
 #content div.box table th.right {
 text-align:right;
+}
 #content div.box table th.center {
 text-align:center;
+}
 #content div.box table th.selected {
 vertical-align:middle;
 padding:0;
+}
 #content div.box table td {
 background:#fff;
 border-bottom:1px solid #cdcdcd;
 vertical-align:middle;
 padding:5px;
+}
 #content div.box table tr.selected td {
 background:#FFC;
+}
 #content div.box table td.selected {
 width:3%;
 text-align:center;
 vertical-align:middle;
 padding:0;
+}
 #content div.box table td.action {
 width:45%;
 text-align:left;
+}
 #content div.box table td.date {
 width:33%;
 text-align:center;
+}
 #content div.box div.action {
 float:right;
 background:#FFF;
 text-align:right;
 margin:10px 0 0;
 padding:0;
+}
 #content div.box div.action select {
 font-family:Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif;
 font-size:11px;
 margin:0;
+}
 #content div.box div.action .ui-selectmenu {
 margin:0;
 padding:0;
+}
 #content div.box div.pagination {
 height:1%;
 clear:both;
 overflow:hidden;
 margin:10px 0 0;
 padding:0;
+}
 #content div.box div.pagination ul.pager {
 float:right;
 text-align:right;
 margin:0;
 padding:0;
+}
 #content div.box div.pagination ul.pager li {
 height:1%;
 float:left;
 list-style:none;
 background:#ebebeb url("../images/pager.png") repeat-x;
 border-top:1px solid #dedede;
 border-left:1px solid #cfcfcf;
 border-right:1px solid #c4c4c4;
 border-bottom:1px solid #c4c4c4;
 color:#4A4A4A;
 font-weight:700;
 margin:0 0 0 4px;
 padding:0;
+}
 #content div.box div.pagination ul.pager li.separator {
 padding:6px;
+}
 #content div.box div.pagination ul.pager li.current {
 background:#b4b4b4 url("../images/pager_selected.png") repeat-x;
 border-top:1px solid #ccc;
 border-left:1px solid #bebebe;
 border-right:1px solid #b1b1b1;
 border-bottom:1px solid #afafaf;
 color:#515151;
 padding:6px;
+}
 #content div.box div.pagination ul.pager li a {
 height:1%;
 display:block;
 float:left;
 color:#515151;
 text-decoration:none;
 margin:0;
 padding:6px;
+}
 #content div.box div.pagination ul.pager li a:hover,#content div.box div.pagination ul.pager li a:active {
 background:#b4b4b4 url("../images/pager_selected.png") repeat-x;
 border-top:1px solid #ccc;
 border-left:1px solid #bebebe;
 border-right:1px solid #b1b1b1;
 border-bottom:1px solid #afafaf;
 margin:-1px;
+}
 #content div.box div.pagination-wh {
 height:1%;
 clear:both;
 overflow:hidden;
 text-align:right;
 margin:10px 0 0;
 padding:0;
+}
 #content div.box div.pagination-right {
 float:right;
+}
 #content div.box div.pagination-wh a,#content div.box div.pagination-wh span.pager_dotdot {
 height:1%;
 float:left;
 background:#ebebeb url("../images/pager.png") repeat-x;
 border-top:1px solid #dedede;
 border-left:1px solid #cfcfcf;
 border-right:1px solid #c4c4c4;
 border-bottom:1px solid #c4c4c4;
 color:#4A4A4A;
 font-weight:700;
 margin:0 0 0 4px;
 padding:6px;
+}
 #content div.box div.pagination-wh span.pager_curpage {
 height:1%;
 float:left;
 background:#b4b4b4 url("../images/pager_selected.png") repeat-x;
 border-top:1px solid #ccc;
 border-left:1px solid #bebebe;
 border-right:1px solid #b1b1b1;
 border-bottom:1px solid #afafaf;
 color:#515151;
 font-weight:700;
 margin:0 0 0 4px;
 padding:6px;
+}
 #content div.box div.pagination-wh a:hover,#content div.box div.pagination-wh a:active {
 background:#b4b4b4 url("../images/pager_selected.png") repeat-x;
 border-top:1px solid #ccc;
 border-left:1px solid #bebebe;
 border-right:1px solid #b1b1b1;
 border-bottom:1px solid #afafaf;
 text-decoration:none;
+}
 #content div.box div.traffic div.legend {
 clear:both;
 overflow:hidden;
 border-bottom:1px solid #ddd;
 margin:0 0 10px;
 padding:0 0 10px;
+}
 #content div.box div.traffic div.legend h6 {
 float:left;
 border:none;
 margin:0;
 padding:0;
+}
 #content div.box div.traffic div.legend li {
 list-style:none;
 float:left;
 font-size:11px;
 margin:0;
 padding:0 8px 0 4px;
+}
 #content div.box div.traffic div.legend li.visits {
 border-left:12px solid #edc240;
+}
 #content div.box div.traffic div.legend li.pageviews {
 border-left:12px solid #afd8f8;
+}
 #content div.box div.traffic table {
 width:auto;
+}
 #content div.box div.traffic table td {
 background:transparent;
 border:none;
 padding:2px 3px 3px;
+}
 #content div.box div.traffic table td.legendLabel {
 padding:0 3px 2px;
+}
 #summary{
+}
 #summary .desc{
 white-space: pre;
 width: 100%;
+}
 #summary .repo_name{
 font-size: 1.6em;
 font-weight: bold;
 vertical-align: baseline;
 clear:right
+}
 #footer {
 clear:both;
 overflow:hidden;
 text-align:right;
 margin:0;
 padding:0 10px 4px;
 margin:-10px 0 0;
+}
 #footer div#footer-inner {
 background:url("../images/header_inner.png") repeat-x scroll 0 0 #003367;
 box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
 -webkit-border-radius: 4px 4px 4px 4px;
 -khtml-border-radius: 4px 4px 4px 4px;
 -moz-border-radius: 4px 4px 4px 4px;
 border-radius: 4px 4px 4px 4px;
+}
 #footer div#footer-inner p {
 padding:15px 25px 15px 0;
 color:#FFF;
 font-weight:700;
+}
 #footer div#footer-inner .footer-link {
 float:left;
 padding-left:10px;
+}
 #footer div#footer-inner .footer-link a,#footer div#footer-inner .footer-link-right a {
 color:#FFF;
+}
 #login div.title {
 width:420px;

rhodecode/templates/admin/users/user_edit.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Edit user')} ${c.user.username} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     ${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-left">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('update_user', id=c.user.user_id),method='put')}
     <div class="form">
         <div class="field">
            <div class="gravatar_box">
                <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
                 <p>
                 %if c.use_gravatar:
                 <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
                 <br/>${_('Using')} ${c.user.email}
                 %else:
                 <br/>${c.user.email}
-                %endif
                 %endif
            </div>
         </div>
         <div class="field">
             <div class="label">
                 <label>${_('API key')}</label> ${c.user.api_key}
             </div>
         </div>
         <div class="fields">
              <div class="field">
                 <div class="label">
                     <label for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="ldap_dn">${_('LDAP DN')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('ldap_dn',class_='medium')}
+                    ${h.text('ldap_dn',class_='medium disabled',readonly="readonly")}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="new_password">${_('New password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('new_password',class_='medium',autocomplete="off")}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="password_confirmation">${_('New password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',class_="medium",autocomplete="off")}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="name">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('name',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='medium')}
                 </div>
              </div>
              <div class="field">
                 <div class="label">
                     <label for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='medium')}
                 </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>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
     	</div>
             </div>
     	</div>
     </div>
     ${h.end_form()}
 </div>
 <div class="box box-right">
     <!-- box / title -->
     <div class="title">
-        <h5>${_('Permissions')}</h5>
         <h5>${_('Permissions')}</h5>
     </div>
     ${h.form(url('user_perm', id=c.user.user_id),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
              <div class="field">
                 <div class="label label-checkbox">
                     <label for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="ui-button")}
               ${h.reset('reset',_('Reset'),class_="ui-button")}
             </div>
         </div>
             </div>
         </div>
     </div>
-    ${h.end_form()}
     ${h.end_form()}
 </div>
 </%def>

0 comments (0 inline, 0 general)