Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge conflict

  • Loading branch information...
commit 661fe05799b1a82a2d7be553bc48865f15ea0dd3 1 parent 9c034e4
@janjongboom janjongboom authored
Showing with 0 additions and 43 deletions.
  1. +0 −43 plugins-client/ext.main/main.xml
View
43 plugins-client/ext.main/main.xml
@@ -28,49 +28,6 @@
zindex = "100000"
/>
-<<<<<<< HEAD
-
- <a:hbox id="view-mode-box-not-loggedin" visible="false" height="55" class="view-mode-box" align="center" edge="0 10">
- <a href="http://c9.io" class="c9-logo-view-mode"></a>
- <a:filler />
- <a:hbox align="center">
- <span class="yellow-label">You are in Guest mode <span class="blue-label">(no editing)</span></span>
- <a href="http://c9.io/site/pricing/" target="_blank" class="nodecor-link">
- <a:button skin="button-colorless" class="dark" onclick="" margin="0 10" width="65">Sign up</a:button>
- </a>
- <span>or</span>
- <a:button skin="button-colorless" class="dark green" onclick="
- ide.addEventListener('login', function() { location.reload(); });
- winLogin.show();
- " margin="0 10" width="115">Sign in to edit</a:button>
- </a:hbox>
- </a:hbox>
- <a:hbox id="view-mode-box-readonly" visible="false" height="35" class="view-mode-box" align="center" edge="0 10">
- <span class="blue-label">This project you are viewing is owned by <span id="lblPrjUser" class="yellow-label"></span></span>
- <a:filler />
- <a:hbox align="center">
- <span class="blue-label">Need edit-rights? Simply
- <a id="chatWithUser" href="javascript:void(0)" class="green-label">chat</a> with the project owner!</span>
- </a:hbox>
- <a:filler />
- <a href="javascript:void(0)" class="white-label nodecor-link"
- onclick="
- self['view-mode-box-readonly'].hide();
- self['view-mode-box-readonly'].noshow=true;
- apf.setStyleClass(vbMain.$ext, '', ['readonly']);
- vbMain.$ext.style.position = '';
- vbMain.$ext.style.top = '0';
- vbMain.$ext.style.left = '0';
- vbMain.$ext.style.right = '0';
- vbMain.$ext.style.bottom = '0';
- vbMain.$ext.style.height = apf.getWindowHeight() + 'px';
- ">
- Hide this!
- </a>
- </a:hbox>
-
-=======
->>>>>>> origin/master
<a:vsplitbox anchors="0 0 0 0" id="vbMain">
<a:bar skin="c9-menu-bar" id="logobar" height="31" minwidth="900">
<a:bar class="fakehbox aligncenter padding3" id="barTools" height="25" style="padding-top:1px">
Please sign in to comment.
Something went wrong with that request. Please try again.