The Unified and Autonomous Development Platform
Fix incorrect blob navigator dropping
robin shen18848d8d86fb
diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.html b/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.htmlindex e52490eee4..e41753bea6 100644--- a/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.html+++ b/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="source-format">+ <div class="source-format clearfix"><wicket:enclosure child="indentType"><div class="pull-left indent-type"><select wicket:id="indentType" class="form-control"></select>diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.css b/web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.cssindex 03bd2ec64e..688df5ffc7 100644--- a/web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.css+++ b/web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.css@@ -6,4 +6,4 @@}.source-format>div {margin-left: 8px;-}\ No newline at end of file+}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.jsindex 31b7ab39dc..e264525a88 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js@@ -27,9 +27,10 @@ turbodev.server.projectBlob = {$(window).resize(function(e) {e.stopPropagation();-+var $head = $("#project-blob>.head");var $revisionPicker = $head.find(">.revision-picker");+ var $operations = $head.find(">.operations");// we should simply call $head.width() here, but the value is incorrect after maximize and restore// window in IE and Chrome (maybe due to use of table in sidebar?), so we go with the complicate@@ -37,7 +38,7 @@ turbodev.server.projectBlob = {var headWidth = $("#project").width() - $("#project>.sidebar>table>tbody>tr>td.nav").outerWidth();// below code moves file navigator to bottom if it is too wide- var maxWidth = headWidth - $revisionPicker.outerWidth() - 130;+ var maxWidth = headWidth - $revisionPicker.outerWidth() - $operations.outerWidth();var maxHeight = $head.height();var $blobNavigator = $head.find(">.blob-navigator");@@ -54,6 +55,7 @@ turbodev.server.projectBlob = {var $blobContent = $("#project-blob>.blob-content");var width = $(window).width()-$blobContent.offset().left;+var height = turbodev.server.projectBlob.getClientHeight();var $searchResult = $("#project-blob>.search-result");if ($searchResult.is(":visible")) {diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.cssindex a00d56b212..8584381e4c 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css@@ -14,6 +14,10 @@.blob-edit>.head .edit {margin-left: 12px;}+.blob-edit>.head .options {+ margin-top: 4px;+ margin-right: -8px;+}.blob-edit>.head .active.tab {background: white;border: 1px solid #BBB;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.html b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.htmlindex 7dbcf064d6..b9f1409e51 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.html@@ -10,16 +10,18 @@</wicket:enclosure><span wicket:id="size"></span></div>- <div class="pull-right actions">- <wicket:container wicket:id="changeActions">- <a wicket:id="edit"><i class="fa fa-pencil"></i> Edit</a>- <a wicket:id="delete"><i class="fa fa-trash"></i> Delete</a>- </wicket:container>- <a wicket:id="raw"><i class="fa fa-file-o"></i> Raw</a>- <input type="checkbox" wicket:id="blame"> Blame</input>- <wicket:container wicket:id="extraActions"></wicket:container>+ <div class="actions-and-options pull-right clearfix">+ <div wicket:id="options" class="pull-left options"></div>+ <div class="pull-left actions">+ <wicket:container wicket:id="changeActions">+ <a wicket:id="edit"><i class="fa fa-pencil"></i> Edit</a>+ <a wicket:id="delete"><i class="fa fa-trash"></i> Delete</a>+ </wicket:container>+ <a wicket:id="raw"><i class="fa fa-file-o"></i> Raw</a>+ <input type="checkbox" wicket:id="blame"> Blame</input>+ <wicket:container wicket:id="extraActions"></wicket:container>+ </div></div>- <div wicket:id="options" class="pull-right options"></div></div><div class="body"><wicket:child></wicket:child>diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.cssindex e40a9fc5e5..93fdf8b14c 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css@@ -11,14 +11,14 @@.blob-view>.head>.info .separator {color: #BBB;}-.blob-view>.head>.actions {+.blob-view>.head .actions {white-space: nowrap;}-.blob-view>.head>.actions>* {+.blob-view>.head .actions>* {color: #333;margin-left: 12px;margin-right: 0;}-.blob-view>.head>.actions>input {+.blob-view>.head .actions>input {vertical-align: top;}