summaryrefslogtreecommitdiff
path: root/app/views
AgeCommit message (Collapse)Author
2014-05-22Merge pull request #166 from elijh/feature/footerazul
better detection if price link should be shown in the footer
2014-05-20better detection if price link should be shown in the footerelijah
2014-05-19i18n for error pagesAzul
2014-05-19custom error pages for 404 and 500 errorsAzul
2014-05-14check for presence of service_levelsAzul
This way the pricing link will not be shown for an empty hash. Which is easier to get into the config file than nil. And we can later verify the configuration to have a hash as the service_levels.
2014-05-13move User Control Panel heading out of mastheadAzul
the masthead can only handle content of a limited width. Alternatively we could make the masthead title wider and add padding on the left so it still aligns nicely with the mask. However the wider we make it the worse it looks on small width displays. Another option would be to make the masthead contain multiple lines. However vertical aligment to the middle of 1 OR 2 lines of text is a real pain. So I went with a super simple masthead and the Caption goes below.
2014-05-09Merge pull request #156 from azul/bugfix/5548-hide-signup-forms-without-js0.5.1-rc2azul
hide srp forms when no js is available
2014-05-08minor fix to default pricing chartelijah
2014-05-06minor: fixing commentAzul
2014-05-06hide srp forms when no js is availableAzul
Hiding them using two mechanisms in case one fails: .hidden class - bootstrap hides them then style='display:none' - so they are hidden even if css load fails
2014-05-06Merge pull request #154 from azul/feature/display-pricingazul
adopt pricing view to current service_level format
2014-04-29adopt pricing view to current service_level formatAzul
2014-04-29remove os specific download buttonsAzul
keeping the platform detection for now.
2014-04-29smaller download button with context on dashAzul
To use bitmask services: Download Bitmask
2014-04-29simplify download buttonAzul
2014-04-25simple form: add wrapped and loading... buttons #5542Azul
the loading... text on the buttons was not capitalized before. So in order to change this in a (more or less) single place i added new button types to simple_form: button :wrapped - normal button, with loading and an optional cancel button wrapped in the classical bootstrap action div. cancel option contains the url to go to when canceling. button :loading - simple button with loading text capitalized by using i18n (simple_form.buttons.loading) Conflicts: engines/support/app/views/tickets/new.html.haml
2014-04-25Merge pull request #148 from azul/feature/api-quota-supportazul
Feature/api quota support + current_user null pattern
2014-04-24cleanup homepage buttons someAzul
let's devide the partials rather than having super specific parameters (on_user_page)
2014-04-24add signup and login info on the formsAzul
2014-04-18change service level configuration strategyAzul
The changes to the configuration required some non minor changes to the platform and also added some flexibility we don't require yet - and thus some new possibilities for errors. So instead we still use the allow_..._certs and ..._cert_prefix options. They basically provide the framework in which service levels can operate. The service level configuration will not include the cert prefix anymore. It only states if the service level is rate limited or not. This avoids conflicts between the two configuration options. I also removed the anonymous service level entirely. It was also turning a boolean decision (do we provide anonymous eip or not) into something way more complex. Instead I added the AnonymousServiceLevel class to handle the corner cases for people who are not logged in. Furthermore i renamed the UnauthenticatedUser to AnonymousUser so it matches the Anonymous Service Level nicely. It's also shorter and more intuitive.
2014-04-08moving users: app and test filesAzul
2014-04-08moving all of core into toplevel, tests fail.Azul
2014-02-04applied mcnair's changes to privacy policyelijah
2014-01-23added a customizable 'bye' page for when a user leaveselijah
2014-01-23move #masthead out of main templates to make the masthead partials more ↵elijah
flexible.
2014-01-23added a default footer with links to privacy policy, tos, pricing, about us, ↵elijah
contact.
2014-01-23added default pricing, privacy policy and tos pages.elijah
2013-12-20make sure overview link is active on Users#showAzul
2013-12-20enable billing engine by default, consolidate APP_CONFIG[:payments] and ↵elijah
APP_CONFIG[:braintree] into APP_CONFIG[:billing][:braintree]
2013-12-17Merge branch 'develop' into feature/billing-no-authenticated-paymentsjessib
Conflicts: billing/config/locales/en.yml
2013-12-13refactor: remove Overview controller - we can use Users#showAzul
we were only using Users#show to redirect to the edit action. So I replaced that with the overview and we have no more use for the extra controller. This also simplifies linking to the users in question a lot.
2013-10-30notify user their account was successfully deleted (refs #4216)Azul
Also fixes a cornercase when admins deleted their own account. So far they would be redirected to the users list - which then refused access. Now they'll be redirected to the home landing page as well.
2013-10-08Payments made when authenticated will be donations, and not connected to ↵jessib
customer in any way.
2013-10-01Allow admins to view past-due subscriptions.jessib
2013-09-02Remove references to email_settings controller, which has been removed. An ↵jessib
identities controller will replace it.
2013-08-27Not ideal way to do it, but was proving complicated to have a config file ↵jessib
specify which gems for which environments. Here, we have the billing gem included for the development and test environments only, hardcoded in the Gemfile. Then we show the links to billing based on a config file setting. The setting itself could be used to specify different types of billing, but isn't yet.
2013-08-27Merge branch 'master' into billing_with_testsjessib
2013-08-13Option to disable billing engine and hide billing related links. To actual ↵jessib
disable, must remove billing engine from Gemfile (and re-bundle)
2013-08-08Merge pull request #64 from azul/feature/identity-rewritejessib
Feature/identity rewrite
2013-08-06Fix stupid typo.jessib
2013-08-01Merge branch 'master' into billing_with_testsjessib
Conflicts: app/views/home/index.html.haml
2013-07-31added empty 'home' layout and removed debugger from homecontrollerelijah
2013-07-25Have navigation link to new customer form if user is not already a braintree ↵jessib
customer.
2013-07-24removed email settings controller and viewsAzul
PGP setting has been moved into account settings. It's using the API now issueing an Ajax request without any visual feedback. This obviously is not what we want but it hopefully suffices for uploading gpg keys for testing purposes before the Identity UI is in place.
2013-07-23Some clean-up of billing display.jessib
2013-07-23Some navigation tweaks.jessib
2013-07-22Slight tweaks so navigation basically should work with billing.jessib
2013-07-17Adding some links, which will be removed.jessib
2013-07-11fix incorrect calling of tickets_pathelijah
2013-07-11Slight cleanup due to some emacs annoyances.jessib