kallithea Changeset - 0bc7b5895242

Changeset - 0bc7b5895242

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-11-07 20:50:58
marcin@python-works.com

small anchor cleanup
- fixed readme positioning with fixed bar
- added anchor link to inline comment

3 files changed with 9 insertions and 7 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset_file_comment.html

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -308,99 +308,99 @@ div:hover > a.permalink { @@
 	color: #fff;
+}
 #header ul#logged-user li.highlight a:hover {
 	color: #FFF;
+}
 #header #header-inner {
 	min-height: 44px;
 	clear: both;
 	position: relative;
     background-color: #003B76;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#003B76), to(#00376E) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e);
     background-image: -o-linear-gradient(top, #003b76, #00376e);
     background-image: linear-gradient(top, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',endColorstr='#00376e', GradientType=0 );
 	margin: 0;
 	padding: 0;
 	display: block;
 	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;
+}
 #header #header-inner.hover{
 	position: fixed !important;
 	width: 100% !important;
 	margin-left: -10px !important;
 	z-index: 10000;
     -webkit-border-radius: 0px 0px 0px 0px;
     -khtml-border-radius: 0px 0px 0px 0px;
     -moz-border-radius: 0px 0px 0px 0px;
     border-radius: 0px 0px 0px 0px;
+}
 .ie7 #header #header-inner.hover,
 .ie8 #header #header-inner.hover,
 .ie9 #header #header-inner.hover
+{
     z-index: auto !important;
+}
 .header-pos-fix{
 	margin-top: -44px;
 	padding-top: 44px;
 .header-pos-fix, .anchor{
 	margin-top: -46px;
 	padding-top: 46px;
+}
 #header #header-inner #home a {
 	height: 40px;
 	width: 46px;
 	display: block;
 	background: url("../images/button_home.png");
 	background-position: 0 0;
 	margin: 0;
 	padding: 0;
+}
 #header #header-inner #home a:hover {
 	background-position: 0 -40px;
+}
 #header #header-inner #logo {
 	float: left;
 	position: absolute;
+}
 #header #header-inner #logo h1 {
 	color: #FFF;
 	font-size: 20px;
 	margin: 12px 0 0 13px;
 	padding: 0;
+}
 #header #header-inner #logo a {
 	color: #fff;
 	text-decoration: none;
+}
 #header #header-inner #logo a:hover {
 	color: #bfe3ff;
+}
 #header #header-inner #quick,#header #header-inner #quick ul {
 	position: relative;
 	float: right;
 	list-style-type: none;
 	list-style-position: outside;
 	margin: 8px 8px 0 0;
 	padding: 0;
+}
 #header #header-inner #quick li {
 	position: relative;

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ## usage:
 ## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
 ## ${comment.comment_block(co)}
 ##
 <%def name="comment_block(co)">
   <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
     <div class="comment-wrapp">
   	<div class="meta">
         <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div>
   		<div class="user">
   			${co.author.username}
   		</div>
   		<div class="date">
   			${h.age(co.modified_at)}
+  			${h.age(co.modified_at)} <a class="permalink" href="#comment-${co.comment_id}">&para;</a>
   		</div>
         %if co.status_change:
            <div  style="float:left" class="changeset-status-container">
              <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">&rsaquo;</span></div>
              <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>
              <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>
            </div>
         %endif
       %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
         <div class="buttons">
           <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
         </div>
       %endif
   	</div>
   	<div class="text">
   		${h.rst_w_mentions(co.text)|n}
   	</div>
     </div>
   </div>
 </%def>
 <%def name="comment_inline_form()">
 <div id='comment-inline-form-template' style="display:none">
   <div class="comment-inline-form ac">
   %if c.rhodecode_user.username != 'default':
     <div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>
       ${h.form('#', class_='inline-form')}
       <div class="clearfix">
           <div class="comment-help">${_('Commenting on line {1}.')}
           ${(_('Comments parsed using %s syntax with %s support.') % (
                  ('<a href="%s">RST</a>' % h.url('rst_help')),
           	     ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))
+               )
             )|n
+           }
           </div>
             <div class="mentions-container" id="mentions_container_{1}"></div>
             <textarea id="text_{1}" name="text" class="yui-ac-input"></textarea>
       </div>
       <div class="comment-button">
       <input type="hidden" name="f_path" value="{0}">
       <input type="hidden" name="line" value="{1}">
       ${h.submit('save', _('Comment'), class_='ui-btn save-inline-form')}
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
       </div>
       ${h.end_form()}
   %else:

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -193,109 +193,111 @@ @@
     <!-- box / title -->
     <div class="title">
         <h5>${_('Commit activity by day / author')}</h5>
     </div>
     <div class="graph">
          <div style="padding:0 10px 10px 17px;">
          %if c.no_data:
            ${c.no_data_msg}
            %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
                 ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")}
            %endif
         %else:
             ${_('Stats gathered: ')} ${c.stats_percentage}%
         %endif
         </div>
         <div id="commit_history" style="width:450px;height:300px;float:left"></div>
         <div style="clear: both;height: 10px"></div>
         <div id="overview" style="width:450px;height:100px;float:left"></div>
     	<div id="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
 				<table id="legend_choices_tables" class="noborder" style="font-size:smaller;color:#545454"></table>
 	    	</div>
     	</div>
     </div>
 </div>
 %endif
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">
         %if c.repo_changesets:
             ${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
         %else:
             ${_('Quick start')}
          %endif
         </div>
     </div>
     <div class="table">
         <div id="shortlog_data">
             <%include file='../shortlog/shortlog_data.html'/>
         </div>
     </div>
 </div>
 %if c.readme_data:
 <div id="readme" class="box header-pos-fix" style="background-color: #FAFAFA">
     <div id="readme" class="title" title="${_("Readme file at revision '%s'" % c.rhodecode_db_repo.landing_rev)}">
 <div id="readme" class="anchor">
 <div class="box" style="background-color: #FAFAFA">
     <div class="title" title="${_("Readme file at revision '%s'" % c.rhodecode_db_repo.landing_rev)}">
         <div class="breadcrumbs">
             <a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a>
             <a class="permalink" href="#readme" title="${_('Permalink to this readme')}">&para;</a>
         </div>
     </div>
-    <div id="readme" class="readme">
     <div class="readme">
       <div class="readme_box">
         ${c.readme_data|n}
       </div>
     </div>
 </div>
 </div>
 %endif
 <script type="text/javascript">
 var clone_url = 'clone_url';
 YUE.on(clone_url,'click',function(e){
     if(YUD.hasClass(clone_url,'selected')){
         return
+    }
     else{
         YUD.addClass(clone_url,'selected');
         YUD.get(clone_url).select();
+    }
 })
 YUE.on('clone_by_name','click',function(e){
     // show url by name and hide name button
     YUD.setStyle('clone_url','display','');
     YUD.setStyle('clone_by_name','display','none');
     // hide url by id and show name button
     YUD.setStyle('clone_by_id','display','');
     YUD.setStyle('clone_url_id','display','none');
 })
 YUE.on('clone_by_id','click',function(e){
 	// show url by id and hide id button
 	YUD.setStyle('clone_by_id','display','none');
     YUD.setStyle('clone_url_id','display','');
     // hide url by name and show id button
 	YUD.setStyle('clone_by_name','display','');
 	YUD.setStyle('clone_url','display','none');
 })
 var tmpl_links = {};
 %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
   tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.dbrepo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='archive_icon ui-btn')}';
 %endfor
 YUE.on(['download_options','archive_subrepos'],'change',function(e){
    var sm = YUD.get('download_options');
    var new_cs = sm.options[sm.selectedIndex];
    for(k in tmpl_links){
        var s = YUD.get(k+'_link');
        if(s){

0 comments (0 inline, 0 general)