[PATCH conductor 0/11] Converge-ui gelato/master merge rev1

Matt Wagner matt.wagner at redhat.com
Tue Jun 5 14:37:02 UTC 2012


On Tue, Jun 05, 2012 at 03:20:03PM +0200, Jirka Tomasek wrote:
> This patchset brings converge-ui into master. Patchset reverts reverted gelato branch merge, adds Brian McLaughlin's gelato patches, implements RM 3364, 3368 and partially 3323.
> 
> Before you apply onto master, install rubygem-compass and rubygem-compass-960-plugin. Then when you apply the patchset run "git submodule init" and "git submodule update"
> 
> 0001-Revert-Revert-Merge-branch-gelato.patch
> 0002-Unified-UI-converge-ui-changes-to-header-footer-usin.patch
> 0003-Adding-compass-gem-dependancy-and-symbolic-link-for-.patch
> 0004-converge-ui-meeting-updates.patch
> 0005-updated-converge-ui-to-latest-version.patch
> 0006-Added-symlink-for-fonts-removed-fonts-conductor-styl.patch
> 0007-Finishing-touches-in-converge-ui-integration.patch
> 0008-Moved-compass-config-file-to-proper-place-removed-un.patch
> 0009-Removed-Sass-Plugin-scss-compilation-from-developmen.patch
> 0010-Removed-old-favicon-and-added-new-into-public-images.patch
> 0011-rpmbuild-changes-added-converge-ui-files-compass-Bui.patch
> 
> Jirka

ACK, with a nit and a few notes. (I snipped the message heavily.)


> From 13392742b7ad925c684c98d9f490e261d1093c41 Mon Sep 17 00:00:00 2001
> From: Jiri Tomasek <jtomasek at redhat.com>
> Date: Fri, 1 Jun 2012 17:01:01 +0200
> Subject: [PATCH conductor 11/11] rpmbuild changes: added converge-ui files,
>  compass BuildRequire dependency,
>  converge-ui symlinks creation and scss
>  compilation using compass into spec file
> 
> ---
>  Makefile                 |    1 +
>  aeolus-conductor.spec.in |   47 +++++++++++++++++++++++++++++++--------------
>  2 files changed, 33 insertions(+), 15 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 4c6f40b..e1c75d2 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -46,6 +46,7 @@ dist:
>  	mkdir -p dist/aeolus-conductor-$(VERSION)
>  	cp -a aeolus-conductor.spec AUTHORS conf COPYING Makefile src \
>  		dist/aeolus-conductor-$(VERSION)
> +	rm -f dist/aeolus-conductor-$(VERSION)/src/vendor/converge-ui/converge-ui-devel.spec
>  	tar -C dist -zcvf aeolus-conductor-$(VERSION).tar.gz aeolus-conductor-$(VERSION)
>  
>  
> diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
> index 4c5aad5..d9c6443 100644
> --- a/aeolus-conductor.spec.in
> +++ b/aeolus-conductor.spec.in
> @@ -63,6 +63,8 @@ Requires: rubygem(ruby-net-ldap)
>  Requires: curl
>  
>  BuildRequires: rubygem(sass)
> +BuildRequires: rubygem(compass)
> +BuildRequires: rubygem(compass-960-plugin)

I think these should also be Requires lines. Isn't the user expected to
have these installed, based on compass.rb? (I may be wrong.)

>  
>  BuildArch: noarch
>  
> @@ -178,7 +180,9 @@ getent passwd aeolus >/dev/null || \
>  builder="app/views/errors"
>  css="public/stylesheets public/stylesheets/jquery.ui-1.8.1"
>  feature="features"
> -gif="public/images public/stylesheets/images"
> +gif="public/images \
> +     public/stylesheets/images \
> +     vendor/converge-ui/images"
>  haml="app/views/hardware_profiles app/views/realm_mappings \
>        app/views/users app/views/provider_accounts \
>        app/views/roles app/views/providers app/views/settings \
> @@ -195,33 +199,41 @@ haml="app/views/hardware_profiles app/views/realm_mappings \
>        app/views/images \
>        app/views/api/builds app/views/api/provider_images \
>        app/views/api/target_images app/views/api/entrypoint \
> -      app/views/api/environments"
> +      app/views/api/environments \
> +      vendor/converge-ui/rails/layouts"
>  mustache="app/views/instances app/views/pools app/views/deployments \
>            app/views/deployables app/views/images"
>  html="public"
>  ico="public"
> -jpg="public/images public/stylesheets/images"
> +jpg="public/images \
> +     public/stylesheets/images \
> +     vendor/converge-ui/images"
>  js="public/javascripts \
>      public/javascripts/jquery.ui-1.8.1 \
>      public/javascripts/jquery.ui-1.8.1/ui/minified \
> -    public/javascripts/lib
> +    public/javascripts/lib \
>      public/javascripts/backbone"
>  json="spec/fixtures"
>  key="features/upload_files"
>  opts="spec"
> -png="public/images public/images/icons public/stylesheets/images \
> -     public/stylesheets/jquery.ui-1.8.1/images"
> +png="public/images \
> +     public/images/icons \
> +     public/stylesheets/images \
> +     public/stylesheets/jquery.ui-1.8.1/images \
> +     vendor/converge-ui/images \
> +     vendor/converge-ui/images/icons"
>  rake="lib/tasks"
>  rb="app/models app/controllers app/controllers/api app/helpers app/services app/util \
>      config config/initializers config/environments db db/migrate \
>      features/support features/step_definitions lib spec spec/controllers \
>      spec/factories spec/helpers spec/models spec/services spec/controllers/api \
> -    spec/aeolus/event spec/aeolus/ext lib/aeolus lib/aeolus/event lib/aeolus/ext"
> +    spec/aeolus/event spec/aeolus/ext lib/aeolus lib/aeolus/event lib/aeolus/ext \
> +    vendor/converge-ui/rails/helpers"
>  rhtml="app/views/layouts"
> -svg="public/images public/images/icons public/fonts"
> -ttf="public/fonts"
> -eot="public/fonts"
> -woff="public/fonts"
> +svg="public/images public/images/icons public/fonts vendor/converge-ui/fonts"
> +ttf="public/fonts vendor/converge-ui/fonts"
> +eot="public/fonts vendor/converge-ui/fonts"
> +woff="public/fonts vendor/converge-ui/fonts"
>  txt="public"
>  yml="config config/locales config/locales/defaults config/locales/overrides
>       config/locales/role_definitions config/locales/classnames \
> @@ -233,7 +245,7 @@ for filetype in builder css eot feature gif haml mustache html ico jpg js json k
>  
>      for dir in $dirs; do
>          %{__mkdir} -p %{buildroot}%{app_root}/$dir
> -	for i in $(echo src/$dir/*.$filetype); do
> +        for i in $(echo src/$dir/*.$filetype); do
>              test -e "$i" && %{__cp} "$i" %{buildroot}%{app_root}/$dir
>          done
>      done
> @@ -242,9 +254,7 @@ done
>  
>  # precompile stylesheets
>  %{__mkdir} %{buildroot}%{app_root}/public/stylesheets/compiled
> -for stylesheet in layout login; do
> -  sass --style compact ./src/app/stylesheets/$stylesheet.scss %{buildroot}%{app_root}/public/stylesheets/compiled/$stylesheet.css
> -done
> +compass compile --sass-dir ./src/app/stylesheets --css-dir %{buildroot}%{app_root}/public/stylesheets/compiled
>  
>  # misc files
>  %{__cp} src/Rakefile %{buildroot}%{app_root}
> @@ -317,6 +327,11 @@ popd 2>&1 > /dev/null
>  %{__ln_s} -f %{app_root}/config/settings.yml %{_sysconfdir}/%{name}
>  %{__ln_s} -f %{app_root}/config/oauth.json %{_sysconfdir}/%{name}
>  
> +#create converge-ui symlinks
> +%{__ln_s} -f %{app_root}/vendor/converge-ui/rails/layouts %{app_root}/app/views/layouts/converge-ui
> +%{__ln_s} -f %{app_root}/vendor/converge-ui/fonts %{app_root}/public/fonts/converge-ui
> +%{__ln_s} -f %{app_root}/vendor/converge-ui/rails/helpers/layout_helper.rb %{app_root}/app/helpers/layout_helper.rb
> +
>  %postun
>  # kind of a weird construct.  There are two cases where postun gets called;
>  # during the removal of a package and during the cleanup after an upgrade.
> @@ -384,6 +399,8 @@ fi
>  %{app_root}/Rakefile
>  %{app_root}/Gemfile.in
>  %{app_root}/spec/fixtures/Gemfile.in
> +%dir %{app_root}/vendor
> +%{app_root}/vendor/converge-ui
>  %config %{_sysconfdir}/%{name}
>  %doc AUTHORS COPYING
>  %{app_root}/script/upgrade
> -- 
> 1.7.7.6
> 

ACK, with a nit inline. And high-five for the favicon!

There are some issues I think we should work out next sprint:
- The @font-face declarations don't work. I think Apache isn't passing
  the requests through. (This is not an issue with the patch per se.)
- The footer looks unstyled. Believe it's a WIP.
- I think the "My Account" button can go away, since it now points to
  the same place as the username link. That would also help with the
  fact that, for long usernames, the name can overlap the Administer
  tab a bit.

But overall, this is awesome. It's been a long time coming!

-- Matt



More information about the aeolus-devel mailing list