glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

move apps header out of exploreMapsHeader

Browse source
This commit is contained in:
Connor Turland 2016-08-16 15:38:05 +00:00
parent b8c8f25c83
commit 21e2418281
5 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/clean.css.erb
View file

@ -603,6 +603,10 @@
margin-top: 110px;
}
.appsPage #exploreMapsHeader {
display: block;
}
#exploreMapsHeader {
display: none;
position: absolute;

9
app/views/doorkeeper/applications/_script.html.erb
View file

@ -1,10 +1,3 @@
<script type="text/javascript">
Metamaps.Apps = {
init: function () {
Metamaps.Header.changeSection(!!Metamaps.Active.Mapper, 'registered');
Metamaps.GlobalUI.showDiv('#exploreMapsHeader')
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
}
};
</script>

9
app/views/doorkeeper/authorized_applications/_script.html.erb
View file

@ -1,10 +1,3 @@
<script type="text/javascript">
Metamaps.Apps = {
init: function () {
Metamaps.Header.changeSection(!!Metamaps.Active.Mapper, 'authorized');
Metamaps.GlobalUI.showDiv('#exploreMapsHeader')
Metamaps.GlobalUI.Search.open();
Metamaps.GlobalUI.Search.lock();
}
};
</script>

24
app/views/layouts/doorkeeper.html.erb
View file

@ -16,8 +16,15 @@
<% end %>
<%= content_tag :div, class: "main" do %>
<% if params[:controller] == 'doorkeeper/applications' || params[:controller] == 'doorkeeper/authorized_applications'
classes = 'appsPage'
else
classes = ''
end
%>
<div class="wrapper" id="wrapper">
<div class="wrapper <%= classes %>" id="wrapper">
<%= render :partial => 'layouts/upperelements', :locals => {:appsPage => true } %>
@ -33,7 +40,20 @@
<% end %>
<%= render :partial => 'layouts/lowermapelements' %>
<div id="exploreMapsHeader"></div>
<div id="exploreMapsHeader">
<div class="exploreMapsBar exploreElement">
<div class="exploreMapsMenu">
<div class="exploreMapsCenter">
<a href="<%= oauth_applications_path %>" class="activeMaps exploreMapsButton <%= params[:controller] == 'doorkeeper/applications' ? 'active' : nil %>">
<div class="exploreMapsIcon"></div>Registered Apps
</a>
<a href="<%= oauth_authorized_applications_path %>" class="activeMaps exploreMapsButton <%= params[:controller] == 'doorkeeper/authorized_applications' ? 'active' : nil %>">
<div class="exploreMapsIcon"></div>Authorized Apps
</a>
</div>
</div>
</div>
</div>
<p id="toast" class="toast">
<% if devise_error_messages? %>
<%= devise_error_messages! %>

12
frontend/src/components/Header.js
View file

@ -30,7 +30,6 @@ class Header extends Component {
const explore = section == "mine" || section == "active" || section == "shared" || section == "featured"
const mapper = section == "mapper"
const apps = section == "registered" || section == "authorized"
return (
<div className="exploreMapsBar exploreElement">
@ -68,17 +67,6 @@ class Header extends Component {
<div className='clearfloat'></div>
</div>
) : null }
<MapLink show={apps}
href="/oauth/applications"
linkClass={"activeMaps exploreMapsButton" + (section == "registered" ? " active" : "")}
text="Registered Apps"
/>
<MapLink show={apps}
href="/oauth/authorized_applications"
linkClass={"activeMaps exploreMapsButton" + (section == "authorized" ? " active" : "")}
text="Authorized Apps"
/>
</div>
</div>
</div>