Skip to content

Commit

Permalink
Resolve the twitter bootstrap jquery 1.8 dropdown problem
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaurav Chande committed Oct 1, 2012
1 parent 053fa16 commit 6d83268
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.rdoc
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
This gem makes it easy to get a Rails 3.2 app up and running with the This gem makes it easy to get a Rails 3.2 app up and running with the
Shopify API. Shopify API.


The generator creates a basic sessions controller for authenticating with your The generator creates a basic SessionsController for authenticating with your
shop and a HomeController which displays basic information about your shop and a HomeController which displays basic information about your
products, orders and articles. products, orders and articles.


Expand Down
2 changes: 1 addition & 1 deletion lib/generators/shopify_app/README
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
What's next? What's next?
------------ ------------


Make sure to set the Application URL of the application your Shopify partner account Make sure to set the Application URL of the application in your Shopify partner account
to <tt>http://localhost:3000/login</tt>. to <tt>http://localhost:3000/login</tt>.


Then, start your application with: Then, start your application with:
Expand Down
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@


<ul class="nav pull-right"> <ul class="nav pull-right">
<li class="dropdown"> <li class="dropdown">
<%= link_to raw(shop_session.url+' <b class="caret"></b>'), "https://#{shop_session.url}", :class => 'shop_name dropdown-toggle', :'data-toggle' => 'dropdown' %> <%= link_to raw(shop_session.url+' <b class="caret"></b>'), "https://#{shop_session.url}", :class => 'shop_name dropdown-toggle', :'data-toggle' => 'dropdown', :'data-target' => '#' %>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><%= link_to raw('<i class="icon-home"></i> Storefront'), "http://"+shop_session.url, :target => 'blank' %></li> <li><%= link_to raw('<i class="icon-home"></i> Storefront'), "http://"+shop_session.url, :target => 'blank' %></li>
<li><%= link_to raw('<i class="icon-cog"></i> Shopify Admin'), "http://"+shop_session.url+"/admin", :target => 'blank' %></li> <li><%= link_to raw('<i class="icon-cog"></i> Shopify Admin'), "http://"+shop_session.url+"/admin", :target => 'blank' %></li>
<li class="divider"></li> <li class="divider"></li>
<li><%= link_to raw('<i class="icon-off"></i> logout'), logout_path %></li> <li><%= link_to raw('<i class="icon-off"></i> Logout'), logout_path, :method => :delete %></li>
</ul> </ul>
</li> </li>
</ul> </ul>
Expand Down

0 comments on commit 6d83268

Please sign in to comment.