Download as
Browse Code »

Commit 4e00330bb0361f102bbdf9f969273b919040f8a5

Authored by Dmitriy Zaporozhets
1 parent 3dc94ba8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

merge request js/css rewrite

Showing 5 changed files with 76 additions and 50 deletions   Show diff stats
app/assets/images/.directory
  Diff comments   View file @4e00330
1 1 [Dolphin]
2 2 ShowPreview=true
3   -Timestamp=2011,10,28,13,16,25
  3 +Timestamp=2011,12,12,23,25,14
4 4 Version=2
... ...
app/assets/javascripts/merge_requests.js
  Diff comments   View file @4e00330
... ... @@ -0,0 +1,36 @@
  1 +var MergeRequest = {
  2 + diff_loaded: false,
  3 + commits_loaded: false,
  4 +
  5 + init:
  6 + function() {
  7 + $(".merge-tabs a").live("click", function() {
  8 + $(".merge-tabs a").removeClass("active");
  9 + $(this).addClass("active");
  10 + });
  11 +
  12 + $(".merge-tabs a.merge-commits-tab").live("click", function() {
  13 + if(MergeRequest.commits_loaded) {
  14 + $(".merge-request-commits").show();
  15 + } else {
  16 + MergeRequest.loadCommits();
  17 + }
  18 + });
  19 + },
  20 +
  21 + loadCommits:
  22 + function() {
  23 + $(".dashboard-loader").show();
  24 + $.ajax({
  25 + type: "GET",
  26 + url: location.href + "/commits",
  27 + complete: function(){
  28 + MergeRequest.commits_loaded = true;
  29 + $(".dashboard-loader").hide()},
  30 + dataType: "script"});
  31 + },
  32 +
  33 + loadDiff:
  34 + function() {
  35 + }
  36 +}
... ...
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @4e00330
... ... @@ -438,42 +438,6 @@ body.project-page table.no-borders td{
438 438 border:none;
439 439 }
440 440  
441   -#gitlab-tabs {
442   - .ui-tabs-nav {
443   - border-bottom: 1px solid #DEDFE1;
444   -
445   - li {
446   - background: none;
447   - border:none;
448   - font-size: 16px;
449   - margin: 0;
450   - padding: 0;
451   -
452   - a {
453   - margin: 0;
454   - padding: 10px 16px;
455   - width:150px;
456   - }
457   -
458   - &.ui-tabs-selected {
459   - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
460   - background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
461   - background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
462   - background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
463   - font-weight: bold;
464   - border:1px solid #DEDFE1;
465   - border-bottom: 1px solid #DEDFE1;
466   - -webkit-border-top-left-radius: 5px;
467   - -webkit-border-top-right-radius: 5px;
468   - -moz-border-radius-topleft: 5px;
469   - -moz-border-radius-topright: 5px;
470   - border-top-left-radius: 5px;
471   - border-top-right-radius: 5px;
472   - }
473   - }
474   - }
475   -}
476   -
477 441 .ajax-tab-loading {
478 442 padding:40px;
479 443 display:none;
... ... @@ -587,3 +551,25 @@ h4.middle-panel {
587 551 margin-right:30px;
588 552 display:none;
589 553 }
  554 +
  555 +ul.merge-tabs {
  556 + margin: 0;
  557 + border: 1px solid #ccc;
  558 + padding: 10px;
  559 + font-size: 11px;
  560 + font-weight: bold; text-transform: uppercase;
  561 + background: #F7F7F7;
  562 + margin-bottom:20px;
  563 +
  564 + a {
  565 + margin-right:5px;
  566 + @include round-borders-all(4px);
  567 + border: 1px solid #ddd;
  568 + background:none;
  569 + padding: 4px 10px;
  570 +
  571 + &.active {
  572 + background: #eaeaea;
  573 + }
  574 + }
  575 +}
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @4e00330
... ... @@ -40,20 +40,24 @@
40 40 %br
41 41 %br
42 42  
43   -#gitlab-tabs
44   - %ul
45   - %li= link_to "Notes", "#merge-notes"
46   - %li= link_to "Commits", commits_project_merge_request_path(@project, @merge_request)
47   - %li= link_to "Diff", diffs_project_merge_request_path(@project, @merge_request)
48   -
49   - #merge-notes
50   - .issue_notes= render "notes/notes"
51   - .loading{ :style => "display:none;"}
52   - %center= image_tag "ajax-loader.gif"
53   - .clear
  43 +%ul.merge-tabs
  44 + = link_to "Notes", "#", :class => "merge-notes-tab"
  45 + = link_to "Commits","#", "data-url" => commits_project_merge_request_path(@project, @merge_request), :class => "merge-commits-tab"
  46 + = link_to "Diff", diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab"
  47 + %img{:src => "/assets/ajax-loader-facebook.gif", :class => "dashboard-loader"}
  48 +
  49 +.merge-request-notes
  50 + .issue_notes= render "notes/notes"
  51 + .loading{ :style => "display:none;"}
  52 + %center= image_tag "ajax-loader.gif"
  53 + .clear
  54 +
  55 +.merge-request-commits
  56 +
  57 +.merge-request-diffs
54 58  
55 59  
56 60 :javascript
57 61 $(function(){
58   - $("#gitlab-tabs").tabs();
  62 + MergeRequest.init();
59 63 })
... ...
vendor/assets/stylesheets/jquery-ui/jquery-ui.css
  Diff comments   View file @4e00330
1 1 /*
2   - * jQuery UI CSS Framework 1.8.16
  2 + * jQuery UI CSS Framework 1.8.16 Patched for GitLab HQ
3 3 *
4 4 * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
5 5 * Dual licensed under the MIT or GPL Version 2 licenses.
... ...