From bb2b55381d0fde9acf5d367b0d5409d4317cfc17 Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Sat, 16 Nov 2013 16:07:51 -0800 Subject: [PATCH] Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages. Change-Id: I368fe1e0004e623cfbdaa39ff74e82f31c9f95d8 --- .../droiddoc/templates-sdk/assets/css/default.css | 26 ++++++- tools/droiddoc/templates-sdk/docpage.cs | 11 ++- tools/droiddoc/templates-sdk/sample.cs | 80 +++++++++++++++++++--- tools/droiddoc/templates-sdk/sampleindex.cs | 42 ++++++++++++ 4 files changed, 148 insertions(+), 11 deletions(-) diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index c4b81d286..75a8aebaf 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -2497,7 +2497,7 @@ Lightbox } /* -------------------------------------------------------------------------- -Styles for samples project trees and code browsing in resources tab +Styles for samples browser */ #codesample-wrapper { @@ -2543,6 +2543,30 @@ pre#codesample-block span.code-line { display:inline-block; } +/* +Styles for displaying image or video resources in samples browser. +Resources are marked as no-display if they exceed the size limit. +*/ +div#codesample-resource img, div#codesample-resource video { + border: 1px solid #ececec; +} + +div#codesample-resource.noDisplay div { + border: 1px solid #ececec; + width:120px; + margin-bottom:4px; + padding:20px; +} + +div#codesample-resource .noDisplay-message:after { + font-style:italic; + font-size:12px; + content: 'This resource is not available for browsing. To view it, please download the project.'; +} + +/* +Styles for project structure (treeview) page +*/ .structure-dir { background-image:url(../../assets/images/folder.png); background-repeat:no-repeat; diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs index 6faac04ee..74c7cd2d9 100644 --- a/tools/droiddoc/templates-sdk/docpage.cs +++ b/tools/droiddoc/templates-sdk/docpage.cs @@ -74,11 +74,20 @@ + +
+ +
+

- +
diff --git a/tools/droiddoc/templates-sdk/sample.cs b/tools/droiddoc/templates-sdk/sample.cs index 3fed7993f..3b3034965 100644 --- a/tools/droiddoc/templates-sdk/sample.cs +++ b/tools/droiddoc/templates-sdk/sample.cs @@ -50,18 +50,37 @@ -
- -
-
- - - - + + + + + + + + + +
diff --git a/tools/droiddoc/templates-sdk/sampleindex.cs b/tools/droiddoc/templates-sdk/sampleindex.cs index 8db15c4b7..92985c53c 100644 --- a/tools/droiddoc/templates-sdk/sampleindex.cs +++ b/tools/droiddoc/templates-sdk/sampleindex.cs @@ -78,6 +78,48 @@ so don't show src links (we dont have the pages!) ?> + + + + + + -- 2.11.0