Skip to content

Commit

Permalink
Merge pull request #39 from beanh66/master
Browse files Browse the repository at this point in the history
Updating catalog designs
  • Loading branch information
serenamarie125 committed May 23, 2017
2 parents ad60d7a + 780a339 commit 7aa96e3
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 23 deletions.
53 changes: 31 additions & 22 deletions web-console/1-homepage/catalog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,28 @@

## Browse Catalog

![catalog](img/OpenShift-Next-Homepage-AllCat-Getting-Started.png)
![catalog](img/Browse-1.png)
- Initially, upon arriving on the page, the `All` section is highlighted, underlined and expanded, with the catalog items sorted alphabetically by name.
- Deploy Image and Import YAML/JSON links are available on the right side of the catalog primary categories bar.
- Clicking either link will trigger the relevant [overlay panel actions](http://openshift.github.io/openshift-origin-design/web-console/4-patterns/overlay-panel).

![catalog](img/OpenShift-Next-Homepage-AllLang-SingleEmptyCard.png)
![catalog](img/Browse-3.png)
- Any tabs that have subcategories of catalog items will have those subcategories displayed as tiles.
- These tabs should also contain an a `All` tile for catalog items from all subcategories.

### Hover States
![hover](img/OpenShift-Next-Homepage-HoverItem-ProjectList.png)
- Primary categories are highlighted in a lighter blue on hover.
- Clicking on a subcategory tile will open a panel that contains the catalog items.
- By default, the `All` tile should be collapsed.

![catalog](img/Browse-2.png)
- Clicking on an expanded tile should collapse that tile.

### Selection and Hover States
![hover](img/Browse-4.png)
- The selected primary category will be blue with an underline.
- On hover, the primary categories are highlighted in a lighter blue.
- The selected subcategory icon will be a darker shade of the remaining unselected icons (light grey).
- On hover, the subcategory text and icon will be blue.
- Deploy Image and Import YAML are highlighted in a lighter blue on hover.
- Hovering over a catalog item will highlighted the item in a circle and change the item name to blue.
- On hover, catalog items will have a blue circle around the icon and blue text.

### Implementation Details
- Administrators should have the ability to determine which catalog items are available to users.
Expand All @@ -30,25 +38,26 @@
- **Note:** Eventually, customers will have the capability to add their own custom category tabs.
- Some primary categories will have a secondary level of categorization available.
- For secondary levels of categorization, there should again be an `Other` category if there are items to display (not shown in mockup).
- Clicking on a subcategory will open a scrollable panel that contains the catalog items.

### Responsive State
![mobile-1](img/OpenShift-Next-Mobile-V2-scrolledup.png)

- On mobile, the catalog tabs should stack with arrows to the right.
- Deploy Image and Import YAML should be displayed below all primary categories and should have a different visual treatment from the tabs.
### Responsive States

![mobile-2](img/OpenShift-Next-Mobile-subcategories.png)
![catalog](img/Browse-5.png)

- If subcategories exist, selecting the primary category will bring users to another screen to view subcategories as tiles.
- Clicking back will bring users back to the home page with all primary tabs listed.
![catalog](img/Browse-6.png)

![mobile-3](img/OpenShift-Next-Mobile-subcategoryselected-V2.png)
![catalog](img/Browse-7.png)

- Selecting a subcategory tile will bring users to another screen to view catalog items by scrolling.
- On smaller viewports the tiles may need to wrap.
- Expanding a tile will always display the white caret with the catalog contents below the tile.

#### Mobile
- On mobile, the catalog tabs should stack with arrows to the right.
- Deploy Image and Import YAML should be displayed below all primary categories and should have a different visual treatment from the tabs.
- If subcategories exist, selecting the primary category will bring users to another screen to view subcategories.
- On mobile, the subcategories will have the same visual representation as the primary categories.
- Clicking back will bring users back to the home page with all primary tabs listed.
- Selecting a subcategory will bring users to another screen to view catalog items by scrolling.
- **Note:** When subcategories do not exist for a tab, selecting a primary category will bring the user directly to scroll through the catalog items.

![mobile-4](img/OpenShift-Next-Mobile-subcategorydropdown.png)
- The category title will be listed with a dropdown option to switch to another subcategory without navigating back to tiles.
- The current selection will be highlighted with the icon in full color. All other images are muted.
- Clicking "back" from this screen will navigate back to the initial Home Page (skipping the subcategory tile view).
- **Note:** When subcategories do not exist for a tab, selecting a primary category will bring the user directly to a screen like this (without a dropdown option at the top).
![mobile-1](img/MOBILE-Catalog.png)
Binary file added web-console/1-homepage/img/Browse-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/Browse-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/Browse-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/Browse-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/Browse-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/Browse-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/Browse-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/MOBILE-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/MOBILE-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/MOBILE-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/MOBILE-Catalog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-console/1-homepage/img/MOBILE-Projects.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion web-console/1-homepage/project-panel.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
## Responsive Behavior/ Mobile View
- On a mobile device, the right panel should disappear and move to the bottom of the screen, below the catalog content.

![template](img/OpenShift-Next-Mobile-V2-scrolledmore.png)
![template](img/MOBILE-Projects.png)
- Selecting View All will display the full projects lists on a new screen with the back button available.
- Selecting create project will show a full screen with the form and two action buttons, cancel and create at the bottom.

Expand Down

0 comments on commit 7aa96e3

Please sign in to comment.