From 65c956cd17d3b9062e42da3e5775b4f7bbb2f50c Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Mon, 13 Jun 2016 22:19:13 +0530 Subject: [PATCH 01/39] Tags for review Cateories are parsed into tags. Helper functions to allow for tags to be proposed and accepted set up Cleaned up the interface --- Distribution/Server/Features/Html.hs | 34 ++++++++--- Distribution/Server/Features/Tags.hs | 61 ++++++++++++++++--- Distribution/Server/Features/Tags/State.hs | 54 +++++++++++++++- Distribution/Server/Features/Upload.hs | 12 ++++ Distribution/Server/Features/Users.hs | 11 +++- datafiles/templates/Html/package-page.html.st | 1 + 6 files changed, 150 insertions(+), 23 deletions(-) diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 33ac9d86b..769049701 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -279,7 +279,7 @@ htmlFeature env@ServerEnv{..} docsCandidates tarIndexCache candidates templates htmlPreferred = mkHtmlPreferred utilities core versions - htmlTags = mkHtmlTags utilities core list tags + htmlTags = mkHtmlTags utilities core upload list tags htmlSearch = mkHtmlSearch utilities core list names htmlResources = concat [ @@ -473,7 +473,7 @@ mkHtmlCore ServerEnv{serverBaseURI} , withPackagePreferred } UploadFeature{guardAuthorisedAsMaintainerOrTrustee} - TagsFeature{queryTagsForPackage} + TagsFeature{queryTagsForPackage, queryReviewTagsForPackage } documentationFeature@DocumentationFeature{documentationResource, queryDocumentation} TarIndexCacheFeature{cachedTarIndex} reportsFeature @@ -1438,6 +1438,7 @@ data HtmlTags = HtmlTags { mkHtmlTags :: HtmlUtilities -> CoreFeature + -> UploadFeature -> ListFeature -> TagsFeature -> HtmlTags @@ -1447,6 +1448,7 @@ mkHtmlTags HtmlUtilities{..} , lookupPackageName } } + UploadFeature{guardAuthorisedAsUploaderOrMaintainerOrTrustee} ListFeature{makeItemList} TagsFeature{..} = HtmlTags{..} where @@ -1527,14 +1529,28 @@ mkHtmlTags HtmlUtilities{..} serveTagsForm dpath = do pkgname <- packageInPath dpath currTags <- queryTagsForPackage pkgname + revTags <- queryReviewTagsForPackage pkgname let tagsStr = concat . intersperse ", " . map display . Set.toList $ currTags - return $ toResponse $ Resource.XHtml $ hackagePage "Edit package tags" - [paragraph << [toHtml "Set tags for ", packageNameLink pkgname], - form ! [theclass "box", XHtml.method "post", action $ packageTagsUri tags "" pkgname] << - [ hidden "_method" "PUT" - , dlist . ddef . toHtml $ makeInput [thetype "text", value tagsStr] "tags" "Set tags to " - , paragraph << input ! [thetype "submit", value "Set tags"] - ]] + tagForm = toResponse $ Resource.XHtml $ hackagePage "Edit package tags" + [paragraph << [toHtml "Set tags for ", packageNameLink pkgname], + form ! [theclass "box", XHtml.method "post", action $ packageTagsUri tags "" pkgname] << + [ hidden "_method" "PUT" + , dlist . ddef . toHtml $ makeInput [thetype "text", value tagsStr] "tags" "Set tags to " + , paragraph << input ! [thetype "submit", value "Set tags"] + ]] + tagRForm = toResponse $ Resource.XHtml $ hackagePage "Edit package tags" + [paragraph << [toHtml "Set tags for ", packageNameLink pkgname], + form ! [theclass "box", XHtml.method "post", action $ packageTagsUri tags "" pkgname] << + [ hidden "_method" "PUT" + , dlist . ddef . toHtml $ makeInput [thetype "text", value tagsStr] "tags" "Set tags to " + , paragraph << input ! [thetype "submit", value "Set tags"] + ], paragraph << ["Proposals" ++ (show revTags)]] + user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname + case user of + "Uploaders" -> return tagForm + otherwise -> case revTags of + Nothing -> return tagForm + Just s -> return tagRForm {------------------------------------------------------------------------------- Search diff --git a/Distribution/Server/Features/Tags.hs b/Distribution/Server/Features/Tags.hs index de1f0e141..59e03f8c1 100644 --- a/Distribution/Server/Features/Tags.hs +++ b/Distribution/Server/Features/Tags.hs @@ -12,11 +12,13 @@ module Distribution.Server.Features.Tags ( import Control.Applicative (optional) import Distribution.Server.Framework +import Distribution.Server.Framework.Auth import Distribution.Server.Framework.BackupDump +import Debug.Trace import Distribution.Server.Features.Tags.State import Distribution.Server.Features.Tags.Backup - +import Distribution.Server.Features.Users( guardAuthorised' ) import Distribution.Server.Features.Core import Distribution.Server.Features.Upload @@ -47,11 +49,13 @@ data TagsFeature = TagsFeature { queryGetTagList :: forall m. MonadIO m => m [(Tag, Set PackageName)], queryTagsForPackage :: forall m. MonadIO m => PackageName -> m (Set Tag), + queryReviewTagsForPackage :: forall m. MonadIO m => PackageName -> m (Maybe (Set Tag,Set Tag)), -- All package names that were modified, and all tags that were modified -- In almost all cases, one of these will be a singleton. Happstack -- functions should be used to query the resultant state. tagsUpdated :: Hook (Set PackageName, Set Tag) (), + -- Calculated tags are used so that other features can reserve a -- tag for their own use (a calculated, rather than freely -- assignable, tag). It is a subset of the main mapping. @@ -63,6 +67,7 @@ data TagsFeature = TagsFeature { withTagPath :: forall a. DynamicPath -> (Tag -> Set PackageName -> ServerPartE a) -> ServerPartE a, collectTags :: forall m. MonadIO m => Set PackageName -> m (Map PackageName (Set Tag)), + putTags :: PackageName -> ServerPartE () } @@ -87,11 +92,12 @@ initTagsFeature :: ServerEnv -> IO TagsFeature) initTagsFeature ServerEnv{serverStateDir} = do tagsState <- tagsStateComponent serverStateDir + tagsReview <- tagsReviewComponent serverStateDir specials <- newMemStateWHNF emptyPackageTags updateTag <- newHook return $ \core@CoreFeature{..} upload -> do - let feature = tagsFeature core upload tagsState specials updateTag + let feature = tagsFeature core upload tagsState tagsReview specials updateTag registerHookJust packageChangeHook isPackageChangeAny $ \(pkgid, mpkginfo) -> case mpkginfo of @@ -106,7 +112,7 @@ initTagsFeature ServerEnv{serverStateDir} = do tagsStateComponent :: FilePath -> IO (StateComponent AcidState PackageTags) tagsStateComponent stateDir = do - st <- openLocalStateFrom (stateDir "db" "Tags") initialPackageTags + st <- openLocalStateFrom (stateDir "db" "Tags" "Existing") initialPackageTags return StateComponent { stateDesc = "Package tags" , stateHandle = st @@ -117,9 +123,25 @@ tagsStateComponent stateDir = do , resetState = tagsStateComponent } +tagsReviewComponent :: FilePath -> IO (StateComponent AcidState ReviewTags) +tagsReviewComponent stateDir = do + st <- openLocalStateFrom (stateDir "db" "Tags" "Review") emptyReviewTags + return StateComponent { + stateDesc = "Review tags" + , stateHandle = st + , getState = query st GetReviewTags + , putState = update st . ReplaceReviewTags + -- , backupState = \_ pkgTags -> [csvToBackup ["tags.csv"] $ tagsToCSV pkgTags] + -- , restoreState = tagsBackup + -- , resetState = tagsStateComponent + } + + + tagsFeature :: CoreFeature -> UploadFeature -> StateComponent AcidState PackageTags + -> StateComponent AcidState ReviewTags -> MemState PackageTags -> Hook (Set PackageName, Set Tag) () -> TagsFeature @@ -127,8 +149,9 @@ tagsFeature :: CoreFeature tagsFeature CoreFeature{ queryGetPackageIndex , coreResource = CoreResource { guardValidPackageName } } - UploadFeature{ guardAuthorisedAsMaintainerOrTrustee } + UploadFeature{ guardAuthorisedAsUploaderOrMaintainerOrTrustee } tagsState + tagsReview calculatedTags tagsUpdated = TagsFeature{..} @@ -177,6 +200,9 @@ tagsFeature CoreFeature{ queryGetPackageIndex queryTagsForPackage :: MonadIO m => PackageName -> m (Set Tag) queryTagsForPackage pkgname = queryState tagsState (TagsForPackage pkgname) + queryReviewTagsForPackage :: MonadIO m => PackageName -> m (Maybe (Set Tag,Set Tag)) + queryReviewTagsForPackage pkgname = queryState tagsReview (LookupReviewTags pkgname) + setCalculatedTag :: Tag -> Set PackageName -> IO () setCalculatedTag tag pkgs = do modifyMemState calculatedTags (setTag tag pkgs) @@ -198,17 +224,31 @@ tagsFeature CoreFeature{ queryGetPackageIndex putTags :: PackageName -> ServerPartE () putTags pkgname = do guardValidPackageName pkgname - guardAuthorisedAsMaintainerOrTrustee pkgname + -- a <- guardAuthorised' [InGroup uploadersGroup] mtags <- optional $ look "tags" case simpleParse =<< mtags of Just (TagList tags) -> do - calcTags <- fmap (packageToTags pkgname) $ readMemState calculatedTags - let tagSet = Set.fromList tags `Set.union` calcTags - void $ updateState tagsState $ SetPackageTags pkgname tagSet - runHook_ tagsUpdated (Set.singleton pkgname, tagSet) - return () + user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname + case user of + "Uploaders" -> do + calcTags <- queryTagsForPackage pkgname + let tagSet = Set.difference (Set.fromList tags) calcTags + let tagRem = Set.difference calcTags (Set.fromList tags) + void $ updateState tagsReview $ InsertReviewTags pkgname tagSet tagRem + return () + otherwise -> do + calcTags <- fmap (packageToTags pkgname) $ readMemState calculatedTags + let tagSet = Set.fromList tags `Set.union` calcTags + add = Set.difference (Set.fromList tags) calcTags + del = Set.difference calcTags (Set.fromList tags) + void $ updateState tagsState $ SetPackageTags pkgname tagSet + void $ updateState tagsReview $ ClearReviewTags pkgname + runHook_ tagsUpdated (Set.singleton pkgname, tagSet) + return () Nothing -> errBadRequest "Tags not recognized" [MText "Couldn't parse your tag list. It should be comma separated with any number of alphanumerical tags. Tags can also also have -+#*."] + + -- initial tags, on import constructTagIndex :: PackageIndex PkgInfo -> PackageTags constructTagIndex = foldl' addToTags emptyPackageTags . PackageIndex.allPackagesByName @@ -249,6 +289,7 @@ constructImmutableTags genDesc = ++ (if he then [Tag "program"] else []) ++ (if ht then [Tag "test"] else []) ++ (if hb then [Tag "benchmark"] else []) + ++ (constructCategoryTags desc) where licenseToTag :: License -> [Tag] licenseToTag l = case l of diff --git a/Distribution/Server/Features/Tags/State.hs b/Distribution/Server/Features/Tags/State.hs index cbda74c30..81d30e491 100644 --- a/Distribution/Server/Features/Tags/State.hs +++ b/Distribution/Server/Features/Tags/State.hs @@ -1,7 +1,6 @@ {-# LANGUAGE DeriveDataTypeable, TypeFamilies, TemplateHaskell, GeneralizedNewtypeDeriving #-} module Distribution.Server.Features.Tags.State where - import Distribution.Server.Framework.Instances () import Distribution.Server.Framework.MemSize @@ -65,11 +64,19 @@ data PackageTags = PackageTags { packageTags :: Map PackageName (Set Tag), -- a secondary reverse mapping tagPackages :: Map Tag (Set PackageName) + -- tags(add, remove) set for review by the maintainer + -- reviewTags :: Map PackageName (Set Tag, Set Tag) } deriving (Eq, Show, Typeable) +-- Packagename (Proposed Additions, Proposed Deletions) +data ReviewTags = ReviewTags (Map PackageName (Set Tag, Set Tag)) deriving (Eq, Show) + emptyPackageTags :: PackageTags emptyPackageTags = PackageTags Map.empty Map.empty +emptyReviewTags :: ReviewTags +emptyReviewTags = ReviewTags Map.empty + tagToPackages :: Tag -> PackageTags -> Set PackageName tagToPackages tag = Map.findWithDefault Set.empty tag . tagPackages @@ -142,6 +149,8 @@ renameTag tag tag' pkgTags@(PackageTags _ packages) = $(deriveSafeCopy 0 'base ''Tag) $(deriveSafeCopy 0 'base ''PackageTags) +$(deriveSafeCopy 0 'base ''ReviewTags) + instance NFData PackageTags where rnf (PackageTags a b) = rnf a `seq` rnf b @@ -167,12 +176,22 @@ getPackageTags = ask replacePackageTags :: PackageTags -> Update PackageTags () replacePackageTags = put +getReviewTags :: Query ReviewTags ReviewTags +getReviewTags = ask + +replaceReviewTags :: ReviewTags -> Update ReviewTags () +replaceReviewTags = put + setPackageTags :: PackageName -> Set Tag -> Update PackageTags () setPackageTags name tagList = modify $ setTags name tagList setTagPackages :: Tag -> Set PackageName -> Update PackageTags () setTagPackages tag pkgList = modify $ setTag tag pkgList +-- setReviewPackageTags :: PackageName -> (Set Tag, Set Tag) -> Update PackageTags () +-- setReviewPackageTags name (tagList1, taglist2) = modify $ setTags name reviewTags + + -- | Tag a package. Returns True if the element was inserted, and False if -- the tag as already present (same result though) addPackageTag :: PackageName -> Tag -> Update PackageTags Bool @@ -191,7 +210,36 @@ removePackageTag name tag = do Nothing -> return False Just pkgTags' -> put pkgTags' >> return True -makeAcidic ''PackageTags ['tagsForPackage +clearReviewTags :: PackageName -> Update ReviewTags () +clearReviewTags pkgname + = do + ReviewTags m <- get + put (ReviewTags (Map.insert pkgname (Set.empty,Set.empty) m)) + + +insertReviewTags :: PackageName -> Set Tag -> Set Tag -> Update ReviewTags () +insertReviewTags pkgname add del + = do + ReviewTags m <- get + put (ReviewTags (Map.insertWith (insertReviewHelper) pkgname (add,del) m)) + +insertReviewHelper :: (Set Tag, Set Tag) -> (Set Tag, Set Tag) -> (Set Tag, Set Tag) +insertReviewHelper (a,b) (c,d) = (Set.union a c, Set.union b d) + +lookupReviewTags :: PackageName -> Query ReviewTags (Maybe (Set Tag, Set Tag)) +lookupReviewTags pkgname + = do ReviewTags m <- ask + return (Map.lookup pkgname m) + +$(makeAcidic ''ReviewTags ['insertReviewTags + ,'lookupReviewTags + ,'getReviewTags + ,'clearReviewTags + ,'replaceReviewTags + ]) + + +$(makeAcidic ''PackageTags ['tagsForPackage ,'packagesForTag ,'getTagList ,'getPackageTags @@ -200,5 +248,5 @@ makeAcidic ''PackageTags ['tagsForPackage ,'setTagPackages ,'addPackageTag ,'removePackageTag - ] + ]) diff --git a/Distribution/Server/Features/Upload.hs b/Distribution/Server/Features/Upload.hs index 2a8196e87..00d43b296 100644 --- a/Distribution/Server/Features/Upload.hs +++ b/Distribution/Server/Features/Upload.hs @@ -59,6 +59,7 @@ data UploadFeature = UploadFeature { maintainersGroup :: PackageName -> UserGroup, -- | Requiring being logged in as the maintainer of a package. + guardAuthorisedAsUploaderOrMaintainerOrTrustee :: PackageName -> ServerPartE String, guardAuthorisedAsMaintainer :: PackageName -> ServerPartE (), -- | Requiring being logged in as the maintainer of a package or a trustee. guardAuthorisedAsMaintainerOrTrustee :: PackageName -> ServerPartE (), @@ -298,6 +299,17 @@ uploadFeature ServerEnv{serverBlobStore = store} guardAuthorisedAsMaintainer pkgname = guardAuthorised_ [InGroup (maintainersGroup pkgname)] + guardAuthorisedAsUploaderOrMaintainerOrTrustee :: PackageName -> ServerPartE String + guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname= do + mt <- guardAuthorised' [InGroup (maintainersGroup pkgname), InGroup trusteesGroup] + upl <- guardAuthorised' [AnyKnownUser] + if mt + then return "MaintainersOrTrustees" + else + if upl + then return "Uploaders" + else return "" + guardAuthorisedAsMaintainerOrTrustee :: PackageName -> ServerPartE () guardAuthorisedAsMaintainerOrTrustee pkgname = guardAuthorised_ [InGroup (maintainersGroup pkgname), InGroup trusteesGroup] diff --git a/Distribution/Server/Features/Users.hs b/Distribution/Server/Features/Users.hs index ae4431398..90205a6da 100644 --- a/Distribution/Server/Features/Users.hs +++ b/Distribution/Server/Features/Users.hs @@ -5,7 +5,7 @@ module Distribution.Server.Features.Users ( initUserFeature, UserFeature(..), UserResource(..), - + -- guardAuthorised', GroupResource(..), ) where @@ -61,6 +61,7 @@ data UserFeature = UserFeature { guardAuthorised_ :: [PrivilegeCondition] -> ServerPartE (), -- | Require any of a set of privileges, giving the id of the current user. guardAuthorised :: [PrivilegeCondition] -> ServerPartE UserId, + guardAuthorised' :: [PrivilegeCondition] -> ServerPartE Bool, -- | Require being logged in, giving the id of the current user. guardAuthenticated :: ServerPartE UserId, -- | A hook to override the default authentication error in particular @@ -389,6 +390,14 @@ userFeature templates usersState adminsState Auth.guardPriviledged users uid privconds return uid + guardAuthorised' :: [PrivilegeCondition] -> ServerPartE Bool + guardAuthorised' privconds = do + users <- queryGetUserDb + uid <- guardAuthenticatedWithErrHook users + a <- Auth.checkPriviledged users uid privconds + return a + + -- Simply check if the user is authenticated as some user, without any -- check that they have any particular priveledges. Only useful as a -- building block. diff --git a/datafiles/templates/Html/package-page.html.st b/datafiles/templates/Html/package-page.html.st index 6c376346f..8dc9be033 100644 --- a/datafiles/templates/Html/package-page.html.st +++ b/datafiles/templates/Html/package-page.html.st @@ -19,6 +19,7 @@

The $package.name$ package

[Tags:$tags$] + [ Propose Tags ]
$if(isDeprecated)$ From 87db09ed2f4dafd8698207e6e404013cba32f616 Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Wed, 15 Jun 2016 23:17:10 +0530 Subject: [PATCH 02/39] Browsable Package Index Added Author and Maintainer fields to PackageItem jQuery DataTables used for the page Added votes as a queryable parameter UI changes to propose/accept tags --- Distribution/Server/Features.hs | 1 + Distribution/Server/Features/Html.hs | 94 ++++++++++++++----- .../Server/Features/Html/HtmlUtilities.hs | 11 +++ Distribution/Server/Features/PackageList.hs | 35 +++++-- Distribution/Server/Features/Tags.hs | 46 ++++----- Distribution/Server/Features/Votes.hs | 23 +++-- Distribution/Server/Framework/MemSize.hs | 12 ++- Distribution/Server/Pages/Index.hs | 12 ++- datafiles/static/hackage.css | 2 +- .../templates/Html/tag-interface.html.st | 44 +++++++++ 10 files changed, 214 insertions(+), 66 deletions(-) create mode 100644 datafiles/templates/Html/tag-interface.html.st diff --git a/Distribution/Server/Features.hs b/Distribution/Server/Features.hs index fa2e13256..f5914103a 100644 --- a/Distribution/Server/Features.hs +++ b/Distribution/Server/Features.hs @@ -257,6 +257,7 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do coreFeature -- [reverse index disabled] reverseFeature downloadFeature + votesFeature tagsFeature versionsFeature diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 769049701..1f116d94e 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -63,7 +63,7 @@ import qualified Data.Map as Map import Data.Set (Set) import qualified Data.Set as Set import qualified Data.Vector as Vec -import Data.Maybe (fromMaybe, isJust) +import Data.Maybe (fromMaybe, isJust, fromJust) import Data.Monoid ((<>)) import qualified Data.Text as T import Data.Traversable (traverse) @@ -131,6 +131,7 @@ initHtmlFeature env@ServerEnv{serverTemplatesDir, serverTemplatesMode, , "distro-monitor.html" , "revisions.html" , "package-page.html" + , "tag-interface.html" ] @@ -270,6 +271,7 @@ htmlFeature env@ServerEnv{..} cachePackagesPage cacheNamesPage templates + list htmlUsers = mkHtmlUsers user usersdetails htmlUploads = mkHtmlUploads utilities upload htmlDocUploads = mkHtmlDocUploads utilities core docsCore templates @@ -437,7 +439,8 @@ htmlFeature env@ServerEnv{..} {------------------------------------------------------------------------------- Core --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlCore = HtmlCore { htmlCoreResources :: [Resource] @@ -462,18 +465,19 @@ mkHtmlCore :: ServerEnv -> AsyncCache Response -> AsyncCache Response -> Templates + -> ListFeature -> HtmlCore mkHtmlCore ServerEnv{serverBaseURI} utilities@HtmlUtilities{..} UserFeature{queryGetUserDb} - CoreFeature{coreResource} + CoreFeature{coreResource , queryGetPackageIndex} VersionsFeature{ versionsResource , queryGetDeprecatedFor , queryGetPreferredInfo , withPackagePreferred } UploadFeature{guardAuthorisedAsMaintainerOrTrustee} - TagsFeature{queryTagsForPackage, queryReviewTagsForPackage } + TagsFeature{queryTagsForPackage} documentationFeature@DocumentationFeature{documentationResource, queryDocumentation} TarIndexCacheFeature{cachedTarIndex} reportsFeature @@ -486,6 +490,7 @@ mkHtmlCore ServerEnv{serverBaseURI} cachePackagesPage cacheNamesPage templates + ListFeature{makeItemList} = HtmlCore{..} where cores@CoreResource{packageInPath, lookupPackageName, lookupPackageId} = coreResource @@ -513,6 +518,11 @@ mkHtmlCore ServerEnv{serverBaseURI} , (resourceAt "/packages/names" ) { resourceGet = [("html", const $ readAsyncCache cacheNamesPage)] } + , (resourceAt "/packages/names/experiment" ) { + resourceDesc = [(GET, "Show detailed package dependency information")] + , resourceGet = [("html", + serveMaintainPage')] + } , (extendResource $ corePackagesPage cores) { resourceDesc = [(GET, "Show package index")] , resourceGet = [("html", const $ readAsyncCache cachePackagesPage)] @@ -610,6 +620,17 @@ mkHtmlCore ServerEnv{serverBaseURI} , "versions" $= map packageId pkgs ] + serveMaintainPage' :: DynamicPath -> ServerPartE Response + serveMaintainPage' _ = do + pkgIndex <- queryGetPackageIndex + let packageNames = Pages.toPackageNames pkgIndex + pkgDetails <- liftIO $ makeItemList packageNames + let rowList = map (makeRow) pkgDetails + tabledata = "" +++ rowList +++"" + template <- getTemplate templates "tag-interface.html" + return $ toResponse $ template + [ "tabledata" $= tabledata ] + serveDistroMonitorPage :: DynamicPath -> ServerPartE Response serveDistroMonitorPage dpath = do pkgname <- packageInPath dpath @@ -661,7 +682,8 @@ mkHtmlCore ServerEnv{serverBaseURI} {------------------------------------------------------------------------------- Users --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlUsers = HtmlUsers { htmlUsersResources :: [Resource] @@ -775,7 +797,8 @@ mkHtmlUsers UserFeature{..} UserDetailsFeature{..} = HtmlUsers{..} {------------------------------------------------------------------------------- Uploads --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlUploads = HtmlUploads { htmlUploadsResources :: [Resource] @@ -823,7 +846,8 @@ mkHtmlUploads HtmlUtilities{..} UploadFeature{..} = HtmlUploads{..} {------------------------------------------------------------------------------- Documentation uploads --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlDocUploads = HtmlDocUploads { htmlDocUploadsResources :: [Resource] @@ -870,7 +894,8 @@ mkHtmlDocUploads HtmlUtilities{..} CoreFeature{coreResource} DocumentationFeatur {------------------------------------------------------------------------------- Build reports --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlReports = HtmlReports { htmlReportsResources :: [Resource] @@ -916,7 +941,8 @@ mkHtmlReports HtmlUtilities{..} CoreFeature{..} ReportsFeature{..} templates = H {------------------------------------------------------------------------------- Candidates --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlCandidates = HtmlCandidates { htmlCandidatesResources :: [Resource] @@ -1173,7 +1199,8 @@ dependenciesPage isCandidate render = {------------------------------------------------------------------------------- Preferred versions --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlPreferred = HtmlPreferred { htmlPreferredResources :: [Resource] @@ -1391,7 +1418,8 @@ mkHtmlPreferred HtmlUtilities{..} {------------------------------------------------------------------------------- Downloads --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlDownloads = HtmlDownloads { htmlDownloadsResources :: [Resource] @@ -1429,7 +1457,8 @@ mkHtmlDownloads HtmlUtilities{..} DownloadFeature{..} = HtmlDownloads{..} {------------------------------------------------------------------------------- Tags --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlTags = HtmlTags { htmlTagsResources :: [Resource] @@ -1522,7 +1551,7 @@ mkHtmlTags HtmlUtilities{..} _ <- lookupPackageName pkgname -- TODO: necessary? putTags pkgname return $ toResponse $ Resource.XHtml $ hackagePage "Set tags" - [toHtml "Put tags for ", packageNameLink pkgname] + [toHtml "Suggested tags for ", packageNameLink pkgname] -- serve form for editing, to be received by putTags serveTagsForm :: DynamicPath -> ServerPartE Response @@ -1530,31 +1559,43 @@ mkHtmlTags HtmlUtilities{..} pkgname <- packageInPath dpath currTags <- queryTagsForPackage pkgname revTags <- queryReviewTagsForPackage pkgname - let tagsStr = concat . intersperse ", " . map display . Set.toList $ currTags + let toStr = concat . intersperse ", " . map display . Set.toList + tagsStr = toStr currTags + addns = toStr $ fst $ fromJust revTags + delns = toStr $ snd $ fromJust revTags tagForm = toResponse $ Resource.XHtml $ hackagePage "Edit package tags" [paragraph << [toHtml "Set tags for ", packageNameLink pkgname], - form ! [theclass "box", XHtml.method "post", action $ packageTagsUri tags "" pkgname] << + thediv ! [theclass "box"] << [paragraph << [bold $ toHtml "Current Tags", br, toHtml tagsStr], + form ! [ XHtml.method "post", action $ packageTagsUri tags "" pkgname] << [ hidden "_method" "PUT" - , dlist . ddef . toHtml $ makeInput [thetype "text", value tagsStr] "tags" "Set tags to " - , paragraph << input ! [thetype "submit", value "Set tags"] - ]] + , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "addns" "Propose Additions " + , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "delns" "Propose Deletions " + , + paragraph << input ! [thetype "submit", value "Propose tags"] + ]]] tagRForm = toResponse $ Resource.XHtml $ hackagePage "Edit package tags" [paragraph << [toHtml "Set tags for ", packageNameLink pkgname], - form ! [theclass "box", XHtml.method "post", action $ packageTagsUri tags "" pkgname] << + thediv ! [theclass "box"] << [paragraph << [bold $ toHtml "Current Tags", br, toHtml tagsStr], + form ! [ XHtml.method "post", action $ packageTagsUri tags "" pkgname] << [ hidden "_method" "PUT" - , dlist . ddef . toHtml $ makeInput [thetype "text", value tagsStr] "tags" "Set tags to " - , paragraph << input ! [thetype "submit", value "Set tags"] - ], paragraph << ["Proposals" ++ (show revTags)]] + , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "addns" "Propose Additions " + , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "delns" "Propose Deletions " + , + paragraph << input ! [thetype "submit", value "Propose tags"] + ], paragraph << [big $ toHtml "Proposals", br, bold $ toHtml "additions: ", toHtml addns, br, bold $ toHtml "deletions: ", toHtml delns]]] user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname case user of "Uploaders" -> return tagForm - otherwise -> case revTags of + _ -> case revTags of Nothing -> return tagForm - Just s -> return tagRForm + Just _ -> return tagRForm + + {------------------------------------------------------------------------------- Search --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} data HtmlSearch = HtmlSearch { htmlSearchResources :: [Resource] @@ -1813,7 +1854,8 @@ mkHtmlSearch HtmlUtilities{..} {------------------------------------------------------------------------------- Groups --------------------------------------------------------------------------------} +----------------------------------------------------------------------------- +-} htmlGroupResource :: UserFeature -> GroupResource -> [Resource] htmlGroupResource UserFeature{..} r@(GroupResource groupR userR getGroup) = diff --git a/Distribution/Server/Features/Html/HtmlUtilities.hs b/Distribution/Server/Features/Html/HtmlUtilities.hs index cc35b96bf..da928faa1 100644 --- a/Distribution/Server/Features/Html/HtmlUtilities.hs +++ b/Distribution/Server/Features/Html/HtmlUtilities.hs @@ -19,6 +19,7 @@ data HtmlUtilities = HtmlUtilities { packageLink :: PackageId -> Html , packageNameLink :: PackageName -> Html , renderItem :: PackageItem -> Html + , makeRow :: PackageItem -> Html , renderTags :: Set Tag -> [Html] } @@ -32,6 +33,16 @@ htmlUtilities CoreFeature{coreResource} packageNameLink :: PackageName -> Html packageNameLink pkgname = anchor ! [href $ corePackageNameUri cores "" pkgname] << display pkgname + makeRow :: PackageItem -> Html + makeRow item = tr << [ td $ packageNameLink $ itemName item + , td $ toHtml $ show $ itemDownloads item + , td $ toHtml $ show $ itemVotes item + , td $ toHtml $ itemDesc item + , td $ " (" +++ renderTags (itemTags item) +++ ")" + , td $ toHtml $ itemMaintainer item + ] + + renderItem :: PackageItem -> Html renderItem item = li ! classes << [ packageNameLink pkgname diff --git a/Distribution/Server/Features/PackageList.hs b/Distribution/Server/Features/PackageList.hs index c9ac5d140..3b506516d 100644 --- a/Distribution/Server/Features/PackageList.hs +++ b/Distribution/Server/Features/PackageList.hs @@ -10,6 +10,7 @@ import Distribution.Server.Framework import Distribution.Server.Features.Core -- [reverse index disabled] import Distribution.Server.Features.ReverseDependencies +import Distribution.Server.Features.Votes import Distribution.Server.Features.DownloadCount import Distribution.Server.Features.Tags import Distribution.Server.Features.PreferredVersions @@ -55,11 +56,15 @@ data PackageItem = PackageItem { itemDeprecated :: !(Maybe [PackageName]), -- The description of the package from its Cabal file itemDesc :: !String, + -- Maintainer of the package + itemMaintainer :: !String, -- Whether the item is in the Haskell Platform --itemPlatform :: Bool, + -- Author of the package (Probably won't be used in display) + itemVotes :: Int, -- The total number of downloads. (For sorting, not displaying.) -- Updated periodically. - itemDownloads :: !Int, + itemDownloads :: Int, -- The number of direct revdeps. (Likewise.) -- also: distinguish direct/flat? -- [reverse index disabled] itemRevDepsCount :: !Int, @@ -76,11 +81,11 @@ data PackageItem = PackageItem { } instance MemSize PackageItem where - memSize (PackageItem a b c d e f g h i) = memSize9 a b c d e f g h i + memSize (PackageItem a b c d e f g h i j k) = memSize11 a b c d e f g h i j k emptyPackageItem :: PackageName -> PackageItem -emptyPackageItem pkg = PackageItem pkg Set.empty Nothing "" 0 +emptyPackageItem pkg = PackageItem pkg Set.empty Nothing "" "" 0 0 -- [reverse index disabled] 0 False 0 0 0 @@ -89,6 +94,7 @@ initListFeature :: ServerEnv -> IO (CoreFeature -- [reverse index disabled] -> ReverseFeature -> DownloadFeature + -> VotesFeature -> TagsFeature -> VersionsFeature -> IO ListFeature) @@ -99,11 +105,12 @@ initListFeature _env = do return $ \core@CoreFeature{..} -- [reverse index disabled] revs download + votesf@VotesFeature{..} tagsf@TagsFeature{..} versions@VersionsFeature{..} -> do let (feature, modifyItem, updateDesc) = - listFeature core download tagsf versions + listFeature core download votesf tagsf versions itemCache itemUpdate registerHookJust packageChangeHook isPackageChangeAny $ \(pkgid, _) -> @@ -117,11 +124,18 @@ initListFeature _env = do modifyItem pkgname (updateReverseItem revCount) runHook' itemUpdate $ Set.fromDistinctAscList pkgs -} + + registerHook votesUpdated $ \(pkgname, _) -> do + votes <- pkgNumVotes pkgname + modifyItem pkgname (updateVoteItem votes) + runHook_ itemUpdate (Set.singleton pkgname) + registerHook tagsUpdated $ \(pkgs, _) -> do forM_ (Set.toList pkgs) $ \pkgname -> do tags <- queryTagsForPackage pkgname modifyItem pkgname (updateTagItem tags) runHook_ itemUpdate pkgs + registerHook deprecatedHook $ \(pkgname, mpkgs) -> do modifyItem pkgname (updateDeprecation mpkgs) runHook_ itemUpdate (Set.singleton pkgname) @@ -131,6 +145,7 @@ initListFeature _env = do listFeature :: CoreFeature -> DownloadFeature + -> VotesFeature -> TagsFeature -> VersionsFeature -> MemState (Map PackageName PackageItem) @@ -140,7 +155,7 @@ listFeature :: CoreFeature PackageName -> IO ()) listFeature CoreFeature{..} - DownloadFeature{..} TagsFeature{..} VersionsFeature{..} + DownloadFeature{..} VotesFeature{..} TagsFeature{..} VersionsFeature{..} itemCache itemUpdate = (ListFeature{..}, modifyItem, updateDesc) where @@ -201,11 +216,13 @@ listFeature CoreFeature{..} -- [reverse index disabled] revCount <- query . GetReverseCount $ pkgname tags <- queryTagsForPackage pkgname downs <- recentPackageDownloads + votes <- pkgNumVotes pkgname deprs <- queryGetDeprecatedFor pkgname return $ (,) pkgname $ (updateDescriptionItem (pkgDesc pkg) $ emptyPackageItem pkgname) { itemTags = tags , itemDeprecated = deprs , itemDownloads = cmFind pkgname downs + , itemVotes = votes -- [reverse index disabled] , itemRevDepsCount = directReverseCount revCount } @@ -234,6 +251,8 @@ updateDescriptionItem genDesc item = -- This checks if the library is buildable. However, since -- desc is flattened, we might miss some flags. Perhaps use the -- CondTree instead. + -- itemAuthor = author desc, + itemMaintainer = maintainer desc, itemHasLibrary = hasLibs desc, itemNumExecutables = length . filter (buildable . buildInfo) $ executables desc, itemNumTests = length . filter (buildable . testBuildInfo) $ testSuites desc, @@ -245,7 +264,11 @@ updateTagItem tags item = item { itemTags = tags } - +updateVoteItem :: Int -> PackageItem -> PackageItem +updateVoteItem votes item = + item { + itemVotes = votes + } updateDeprecation :: Maybe [PackageName] -> PackageItem -> PackageItem updateDeprecation pkgs item = item { diff --git a/Distribution/Server/Features/Tags.hs b/Distribution/Server/Features/Tags.hs index 59e03f8c1..f41feca75 100644 --- a/Distribution/Server/Features/Tags.hs +++ b/Distribution/Server/Features/Tags.hs @@ -14,7 +14,6 @@ import Control.Applicative (optional) import Distribution.Server.Framework import Distribution.Server.Framework.Auth import Distribution.Server.Framework.BackupDump -import Debug.Trace import Distribution.Server.Features.Tags.State import Distribution.Server.Features.Tags.Backup @@ -224,27 +223,30 @@ tagsFeature CoreFeature{ queryGetPackageIndex putTags :: PackageName -> ServerPartE () putTags pkgname = do guardValidPackageName pkgname - -- a <- guardAuthorised' [InGroup uploadersGroup] - mtags <- optional $ look "tags" - case simpleParse =<< mtags of - Just (TagList tags) -> do - user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname - case user of - "Uploaders" -> do - calcTags <- queryTagsForPackage pkgname - let tagSet = Set.difference (Set.fromList tags) calcTags - let tagRem = Set.difference calcTags (Set.fromList tags) - void $ updateState tagsReview $ InsertReviewTags pkgname tagSet tagRem - return () - otherwise -> do - calcTags <- fmap (packageToTags pkgname) $ readMemState calculatedTags - let tagSet = Set.fromList tags `Set.union` calcTags - add = Set.difference (Set.fromList tags) calcTags - del = Set.difference calcTags (Set.fromList tags) - void $ updateState tagsState $ SetPackageTags pkgname tagSet - void $ updateState tagsReview $ ClearReviewTags pkgname - runHook_ tagsUpdated (Set.singleton pkgname, tagSet) - return () + addns <- optional $ look "addns" + delns <- optional $ look "delns" + case simpleParse =<< addns of + Just (TagList add) -> do + case simpleParse =<< delns of + Just (TagList del) -> do + user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname + case user of + "Uploaders" -> do + calcTags <- queryTagsForPackage pkgname + let addTags = Set.fromList add `Set.difference` calcTags + let delTags = Set.fromList del `Set.intersection` calcTags + void $ updateState tagsReview $ InsertReviewTags pkgname addTags delTags + return () + _ -> do + calcTags <- queryTagsForPackage pkgname + let tagSet = (addTags `Set.union` calcTags) `Set.difference` delTags + addTags = Set.fromList add + delTags = Set.fromList del + void $ updateState tagsState $ SetPackageTags pkgname tagSet + void $ updateState tagsReview $ ClearReviewTags pkgname + runHook_ tagsUpdated (Set.singleton pkgname, tagSet) + return () + _ -> errBadRequest "Tags not recognized" [MText "Couldn't parse your tag list. It should be comma separated with any number of alphanumerical tags. Tags can also also have -+#*."] Nothing -> errBadRequest "Tags not recognized" [MText "Couldn't parse your tag list. It should be comma separated with any number of alphanumerical tags. Tags can also also have -+#*."] diff --git a/Distribution/Server/Features/Votes.hs b/Distribution/Server/Features/Votes.hs index a9cdbb0a5..515ab4440 100644 --- a/Distribution/Server/Features/Votes.hs +++ b/Distribution/Server/Features/Votes.hs @@ -32,9 +32,10 @@ import qualified Text.XHtml.Strict as X -- | Define the prototype for this feature data VotesFeature = VotesFeature { - votesFeatureInterface :: HackageFeature + votesFeatureInterface :: HackageFeature , didUserVote :: forall m. MonadIO m => PackageName -> UserId -> m Bool , pkgNumVotes :: forall m. MonadIO m => PackageName -> m Int + , votesUpdated :: Hook (PackageName, Int) () , renderVotesHtml :: PackageName -> ServerPartE X.Html } @@ -49,11 +50,13 @@ initVotesFeature :: ServerEnv -> IO VotesFeature) initVotesFeature env@ServerEnv{serverStateDir} = do dbVotesState <- votesStateComponent serverStateDir + updateVotes <- newHook return $ \coref@CoreFeature{..} userf@UserFeature{..} -> do let feature = votesFeature env dbVotesState - coref userf + coref userf updateVotes + return feature -- | Define the backing store (i.e. database component) @@ -79,12 +82,14 @@ votesFeature :: ServerEnv -> StateComponent AcidState VotesState -> CoreFeature -- To get site package list -> UserFeature -- To authenticate users + -> Hook (PackageName, Int) () -> VotesFeature votesFeature ServerEnv{..} votesState CoreFeature { coreResource = CoreResource{..} } UserFeature{..} + votesUpdated = VotesFeature{..} where votesFeatureInterface = (emptyHackageFeature "votes") { @@ -133,7 +138,7 @@ votesFeature ServerEnv{..} pkgname <- packageInPath dpath guardValidPackageName pkgname cacheControlWithoutETag [Public, maxAgeMinutes 10] - voteCount <- queryState votesState (GetPackageVoteCount pkgname) + voteCount <- pkgNumVotes pkgname let obj = objectL [ ("packageName", string $ display pkgname) , ("numVotes", toJSON voteCount) @@ -146,8 +151,12 @@ votesFeature ServerEnv{..} uid <- guardAuthorised [AnyKnownUser] pkgname <- packageInPath dpath guardValidPackageName pkgname - + number <- pkgNumVotes pkgname success <- updateState votesState (AddVote pkgname uid) + if success + then runHook_ votesUpdated (pkgname, number+1) + else return () + if success then ok . toResponse $ Render.voteConfirmationPage pkgname "Package voted for successfully" @@ -160,9 +169,11 @@ votesFeature ServerEnv{..} uid <- guardAuthorised [AnyKnownUser] pkgname <- packageInPath dpath guardValidPackageName pkgname - + number <- pkgNumVotes pkgname success <- updateState votesState (RemoveVote pkgname uid) - + if success + then runHook_ votesUpdated (pkgname, number-1) + else return () let responseMsg | success = "Package vote removed successfully." | otherwise = "User has not voted for this package." ok . toResponse $ Render.voteConfirmationPage diff --git a/Distribution/Server/Framework/MemSize.hs b/Distribution/Server/Framework/MemSize.hs index 45788b71a..882b2fb38 100644 --- a/Distribution/Server/Framework/MemSize.hs +++ b/Distribution/Server/Framework/MemSize.hs @@ -2,8 +2,8 @@ module Distribution.Server.Framework.MemSize ( MemSize(..), memSizeMb, memSizeKb, - memSize0, memSize1, memSize2, memSize3, memSize4, - memSize5, memSize6, memSize7, memSize8, memSize9, memSize10, + memSize0, memSize1, memSize2, memSize3, memSize4,memSize5, + memSize6, memSize7, memSize8, memSize9, memSize10,memSize11, memSizeUArray, memSizeUVector ) where @@ -60,7 +60,7 @@ memSize7 :: (MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize memSize8 :: (MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> Int memSize9 :: (MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> Int memSize10 :: (MemSize a9, MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> a9 -> Int - +memSize11 :: (MemSize a10, MemSize a9, MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> a9 -> a10 ->Int memSize0 = 0 memSize1 a = 2 + memSize a @@ -90,6 +90,12 @@ memSize10 a b c d e + memSize g + memSize h + memSize i + memSize j +memSize11 a b c d e + f g h i j k= 12 + memSize a + memSize b + memSize c + + memSize d + memSize e + memSize f + + memSize g + memSize h + memSize i + + memSize j + memSize k + instance MemSize (a -> b) where memSize _ = 0 diff --git a/Distribution/Server/Pages/Index.hs b/Distribution/Server/Pages/Index.hs index 09ff5822b..152e8e9fa 100644 --- a/Distribution/Server/Pages/Index.hs +++ b/Distribution/Server/Pages/Index.hs @@ -1,6 +1,6 @@ -- Generate an HTML page listing all available packages -module Distribution.Server.Pages.Index (packageIndex) where +module Distribution.Server.Pages.Index where import Distribution.Server.Pages.Template ( hackagePage ) import Distribution.Server.Pages.Util ( packageType ) @@ -21,7 +21,6 @@ import qualified Text.XHtml.Strict as XHtml ( name ) import Data.Char (toLower, toUpper, isSpace) import Data.List (intersperse, sortBy, groupBy, nub, maximumBy) - packageIndex :: PackageIndex.PackageIndex PkgInfo -> Html packageIndex = formatPkgGroups . map (mkPackageIndexInfo @@ -30,6 +29,15 @@ packageIndex = formatPkgGroups . maximumBy (comparing packageVersion)) . PackageIndex.allPackagesByName +toPackageNames :: PackageIndex.PackageIndex PkgInfo -> [PackageName] +toPackageNames = map (pii_pkgName + . mkPackageIndexInfo + . flattenPackageDescription + . pkgDesc + . maximumBy (comparing packageVersion)) + . PackageIndex.allPackagesByName + + data PackageIndexInfo = PackageIndexInfo { pii_pkgName :: !PackageName, pii_categories :: ![Category], diff --git a/datafiles/static/hackage.css b/datafiles/static/hackage.css index b6ce49868..f0ae92792 100644 --- a/datafiles/static/hackage.css +++ b/datafiles/static/hackage.css @@ -620,7 +620,7 @@ p.tip { /* Misc admin forms */ -form.box { +.box { background: #faf9dc; border: 1px solid #d8d7ad; padding: 0.5em 1em; diff --git a/datafiles/templates/Html/tag-interface.html.st b/datafiles/templates/Html/tag-interface.html.st new file mode 100644 index 000000000..0ceacfddb --- /dev/null +++ b/datafiles/templates/Html/tag-interface.html.st @@ -0,0 +1,44 @@ + + + + $hackageCssTheme()$ + + + + All packages by name | Hackage + + + + $hackagePageHeader()$ + +
+

All packages by name

+ + + + + + + $tabledata$ + +
NameDownloadsVotesDescriptionTagsMaintainer
+ +
+ + From 6efcaa337f07aba0a48693b3e430b35bdc6f9a11 Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Sat, 18 Jun 2016 23:00:41 +0530 Subject: [PATCH 03/39] Smoothened rough edges in tag proposals A clickable UI for accepting/rejecting tags Added get method to /package/:pkgname/tags shifted forms to a separate template --- Distribution/Server/Features/Html.hs | 93 ++++++++----- Distribution/Server/Features/Tags.hs | 16 ++- Distribution/Server/Features/Tags/State.hs | 13 +- datafiles/templates/Html/tag-edit.html.st | 150 +++++++++++++++++++++ 4 files changed, 237 insertions(+), 35 deletions(-) create mode 100644 datafiles/templates/Html/tag-edit.html.st diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 1f116d94e..c510569b9 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -132,6 +132,7 @@ initHtmlFeature env@ServerEnv{serverTemplatesDir, serverTemplatesMode, , "revisions.html" , "package-page.html" , "tag-interface.html" + , "tag-edit.html" ] @@ -281,7 +282,7 @@ htmlFeature env@ServerEnv{..} docsCandidates tarIndexCache candidates templates htmlPreferred = mkHtmlPreferred utilities core versions - htmlTags = mkHtmlTags utilities core upload list tags + htmlTags = mkHtmlTags utilities core upload list tags templates htmlSearch = mkHtmlSearch utilities core list names htmlResources = concat [ @@ -1470,6 +1471,7 @@ mkHtmlTags :: HtmlUtilities -> UploadFeature -> ListFeature -> TagsFeature + -> Templates -> HtmlTags mkHtmlTags HtmlUtilities{..} CoreFeature{ coreResource = CoreResource{ @@ -1479,7 +1481,9 @@ mkHtmlTags HtmlUtilities{..} } UploadFeature{guardAuthorisedAsUploaderOrMaintainerOrTrustee} ListFeature{makeItemList} - TagsFeature{..} = HtmlTags{..} + TagsFeature{..} + templates + = HtmlTags{..} where tags = tagsResource @@ -1495,7 +1499,7 @@ mkHtmlTags HtmlUtilities{..} resourceGet = [("html", serveTagListing)] } , (extendResource $ packageTagsListing tags) { - resourcePut = [("html", putPackageTags)], resourceGet = [] + resourcePut = [("html", putPackageTags)], resourceGet = [("html", showPackageTags)] } , tagEdit -- (extendResource $ packageTagsEdit tags) { resourceGet = [("html", serveTagsForm)] } ] @@ -1550,8 +1554,42 @@ mkHtmlTags HtmlUtilities{..} pkgname <- packageInPath dpath _ <- lookupPackageName pkgname -- TODO: necessary? putTags pkgname - return $ toResponse $ Resource.XHtml $ hackagePage "Set tags" - [toHtml "Suggested tags for ", packageNameLink pkgname] + currTags <- queryTagsForPackage pkgname + revTags <- queryReviewTagsForPackage pkgname + let toStr = concat . intersperse ", " . map display . Set.toList + tagsStr = toStr currTags + addns = toStr $ fst $ fromMaybe (Set.empty, Set.empty) revTags + delns = toStr $ snd $ fromMaybe (Set.empty, Set.empty) revTags + disp = thediv ! [theclass "box"] << [ paragraph << [bold $ toHtml "Current Tags: ", toHtml tagsStr, br], + paragraph << [bold $ toHtml "Additions to be reviewed: ", toHtml addns, br], + paragraph << [bold $ toHtml "Deletions to be reviewed: ", toHtml delns, br] + ] + + return $ toResponse $ Resource.XHtml $ hackagePage "Package Tags" [ big $ bold $ toHtml $ display pkgname + , disp + , anchor ![href $ "tags/edit" ] << "Propose a tag?", toHtml " or " + , toHtml "return to ", packageNameLink pkgname, br + ] + + showPackageTags :: DynamicPath -> ServerPartE Response + showPackageTags dpath = do + pkgname <- packageInPath dpath + currTags <- queryTagsForPackage pkgname + revTags <- queryReviewTagsForPackage pkgname + let toStr = concat . intersperse ", " . map display . Set.toList + tagsStr = toStr currTags + addns = toStr $ fst $ fromMaybe (Set.empty, Set.empty) revTags + delns = toStr $ snd $ fromMaybe (Set.empty, Set.empty) revTags + disp = thediv ! [theclass "box"] << [ paragraph << [bold $ toHtml "Current Tags: ", toHtml tagsStr, br], + paragraph << [bold $ toHtml "Additions to be reviewed: ", toHtml addns, br], + paragraph << [bold $ toHtml "Deletions to be reviewed: ", toHtml delns, br] + ] + + return $ toResponse $ Resource.XHtml $ hackagePage "Package Tags" [ big $ bold $ toHtml $ display pkgname + , disp + , anchor ![href $ "tags/edit" ] << "Propose a tag?", toHtml " or " + , toHtml "return to ", packageNameLink pkgname, br + ] -- serve form for editing, to be received by putTags serveTagsForm :: DynamicPath -> ServerPartE Response @@ -1559,36 +1597,29 @@ mkHtmlTags HtmlUtilities{..} pkgname <- packageInPath dpath currTags <- queryTagsForPackage pkgname revTags <- queryReviewTagsForPackage pkgname + template <- getTemplate templates "tag-edit.html" let toStr = concat . intersperse ", " . map display . Set.toList tagsStr = toStr currTags - addns = toStr $ fst $ fromJust revTags - delns = toStr $ snd $ fromJust revTags - tagForm = toResponse $ Resource.XHtml $ hackagePage "Edit package tags" - [paragraph << [toHtml "Set tags for ", packageNameLink pkgname], - thediv ! [theclass "box"] << [paragraph << [bold $ toHtml "Current Tags", br, toHtml tagsStr], - form ! [ XHtml.method "post", action $ packageTagsUri tags "" pkgname] << - [ hidden "_method" "PUT" - , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "addns" "Propose Additions " - , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "delns" "Propose Deletions " - , - paragraph << input ! [thetype "submit", value "Propose tags"] - ]]] - tagRForm = toResponse $ Resource.XHtml $ hackagePage "Edit package tags" - [paragraph << [toHtml "Set tags for ", packageNameLink pkgname], - thediv ! [theclass "box"] << [paragraph << [bold $ toHtml "Current Tags", br, toHtml tagsStr], - form ! [ XHtml.method "post", action $ packageTagsUri tags "" pkgname] << - [ hidden "_method" "PUT" - , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "addns" "Propose Additions " - , dlist . ddef . toHtml $ makeInput [thetype "text", value " "] "delns" "Propose Deletions " - , - paragraph << input ! [thetype "submit", value "Propose tags"] - ], paragraph << [big $ toHtml "Proposals", br, bold $ toHtml "additions: ", toHtml addns, br, bold $ toHtml "deletions: ", toHtml delns]]] + addns = toStr $ fst $ fromMaybe (Set.empty,Set.empty) revTags + delns = toStr $ snd $ fromMaybe (Set.empty, Set.empty) revTags + + user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname case user of - "Uploaders" -> return tagForm - _ -> case revTags of - Nothing -> return tagForm - Just _ -> return tagRForm + "Uploaders" -> return $ toResponse . template $ + [ "pkgname" $= display pkgname + , "addns" $= addns + , "tags" $= (tagsStr) + , "delns" $= delns + , "isuser" $= "true" + ] + _ -> return $toResponse . template $ + [ "pkgname" $= display pkgname + , "addns" $= addns + , "tags" $= (tagsStr) + , "delns" $= delns + , "istrustee" $= "false" + ] diff --git a/Distribution/Server/Features/Tags.hs b/Distribution/Server/Features/Tags.hs index f41feca75..b8b9e5bf1 100644 --- a/Distribution/Server/Features/Tags.hs +++ b/Distribution/Server/Features/Tags.hs @@ -32,6 +32,7 @@ import Distribution.PackageDescription import Distribution.PackageDescription.Configuration import Distribution.License +import Data.Maybe(fromMaybe) import Data.Set (Set) import qualified Data.Set as Set import Data.Map (Map) @@ -225,6 +226,8 @@ tagsFeature CoreFeature{ queryGetPackageIndex guardValidPackageName pkgname addns <- optional $ look "addns" delns <- optional $ look "delns" + raddns <- optional $ look "raddns" + rdelns <- optional $ look "rdelns" case simpleParse =<< addns of Just (TagList add) -> do case simpleParse =<< delns of @@ -234,16 +237,25 @@ tagsFeature CoreFeature{ queryGetPackageIndex "Uploaders" -> do calcTags <- queryTagsForPackage pkgname let addTags = Set.fromList add `Set.difference` calcTags - let delTags = Set.fromList del `Set.intersection` calcTags + delTags = Set.fromList del `Set.intersection` calcTags void $ updateState tagsReview $ InsertReviewTags pkgname addTags delTags return () _ -> do calcTags <- queryTagsForPackage pkgname + revTags <- queryReviewTagsForPackage pkgname let tagSet = (addTags `Set.union` calcTags) `Set.difference` delTags addTags = Set.fromList add delTags = Set.fromList del + rdel = case simpleParse =<< rdelns of + Just (TagList rdel) -> rdel + Nothing -> [] + radd = case simpleParse =<< raddns of + Just (TagList radd) -> radd + Nothing -> [] + addRev = Set.difference (fst $ fromMaybe (Set.empty, Set.empty) revTags) (Set.fromList add `Set.union` Set.fromList radd) + delRev = Set.difference (snd $ fromMaybe (Set.empty, Set.empty) revTags) (Set.fromList del `Set.union` Set.fromList rdel) void $ updateState tagsState $ SetPackageTags pkgname tagSet - void $ updateState tagsReview $ ClearReviewTags pkgname + void $ updateState tagsReview $ InsertReviewTags_ pkgname addRev delRev runHook_ tagsUpdated (Set.singleton pkgname, tagSet) return () _ -> errBadRequest "Tags not recognized" [MText "Couldn't parse your tag list. It should be comma separated with any number of alphanumerical tags. Tags can also also have -+#*."] diff --git a/Distribution/Server/Features/Tags/State.hs b/Distribution/Server/Features/Tags/State.hs index 81d30e491..efa702f8d 100644 --- a/Distribution/Server/Features/Tags/State.hs +++ b/Distribution/Server/Features/Tags/State.hs @@ -64,10 +64,9 @@ data PackageTags = PackageTags { packageTags :: Map PackageName (Set Tag), -- a secondary reverse mapping tagPackages :: Map Tag (Set PackageName) - -- tags(add, remove) set for review by the maintainer - -- reviewTags :: Map PackageName (Set Tag, Set Tag) } deriving (Eq, Show, Typeable) + -- Packagename (Proposed Additions, Proposed Deletions) data ReviewTags = ReviewTags (Map PackageName (Set Tag, Set Tag)) deriving (Eq, Show) @@ -96,6 +95,7 @@ alterTags name mtagList (PackageTags tags packages) = setTags :: PackageName -> Set Tag -> PackageTags -> PackageTags setTags pkgname tagList = alterTags pkgname (keepSet tagList) + deletePackageTags :: PackageName -> PackageTags -> PackageTags deletePackageTags name = alterTags name Nothing @@ -223,6 +223,12 @@ insertReviewTags pkgname add del ReviewTags m <- get put (ReviewTags (Map.insertWith (insertReviewHelper) pkgname (add,del) m)) +insertReviewTags_ :: PackageName -> Set Tag -> Set Tag -> Update ReviewTags () +insertReviewTags_ pkgname add del + = do + ReviewTags m <- get + put (ReviewTags (Map.insert pkgname (add,del) m)) + insertReviewHelper :: (Set Tag, Set Tag) -> (Set Tag, Set Tag) -> (Set Tag, Set Tag) insertReviewHelper (a,b) (c,d) = (Set.union a c, Set.union b d) @@ -231,7 +237,10 @@ lookupReviewTags pkgname = do ReviewTags m <- ask return (Map.lookup pkgname m) + + $(makeAcidic ''ReviewTags ['insertReviewTags + ,'insertReviewTags_ ,'lookupReviewTags ,'getReviewTags ,'clearReviewTags diff --git a/datafiles/templates/Html/tag-edit.html.st b/datafiles/templates/Html/tag-edit.html.st new file mode 100644 index 000000000..8367fc9d9 --- /dev/null +++ b/datafiles/templates/Html/tag-edit.html.st @@ -0,0 +1,150 @@ + + + + $hackageCssTheme()$ + Edit package tags | Hackage + + + + + + $hackagePageHeader()$ +
+ Set tags for $pkgname$ +
+

Current Tags +
$tags$

+
+ +
+ + +
+
+ + +
+ + + +
+ $if(isuser)$ +
+ Other proposals +
additions: $addns$ +
deletions: $delns$ +
+ $endif$ + $if(istrustee)$ +
+ Proposals +
additions: +
    +
    deletions: +
      +
      + $endif$ + +
      +
      + $footer()$ + + + From 138731ca77c3d2b497ad62085baa10a2a5965c3a Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Tue, 21 Jun 2016 01:18:12 +0530 Subject: [PATCH 04/39] Tag Aliasing When a trustee aliases Tag abcd -> Tag abc, all packages that were earlier tagged `abcd` get tagged to `abc` and any new packages tagged `abcd` get retagged `abc` on upload --- Distribution/Server/Features/Core.hs | 5 +- Distribution/Server/Features/Html.hs | 38 ++++++++++- Distribution/Server/Features/Tags.hs | 73 +++++++++++++++++++--- Distribution/Server/Features/Tags/State.hs | 44 ++++++++++++- Distribution/Server/Features/Upload.hs | 5 ++ 5 files changed, 151 insertions(+), 14 deletions(-) diff --git a/Distribution/Server/Features/Core.hs b/Distribution/Server/Features/Core.hs index 60fa1d581..a82c724b9 100644 --- a/Distribution/Server/Features/Core.hs +++ b/Distribution/Server/Features/Core.hs @@ -230,7 +230,8 @@ data CoreResource = CoreResource { -- | Find a PackageId or PackageName inside a path. packageInPath :: forall m a. (MonadPlus m, FromReqURI a) => DynamicPath -> m a, - + -- | Find a TagName inside a path. + tagInPath :: forall m a. (MonadPlus m, FromReqURI a) => DynamicPath -> m a, -- | Find a tarball's PackageId from inside a path, doing some checking -- for consistency between the package and tarball. -- @@ -448,6 +449,8 @@ coreFeature ServerEnv{serverBlobStore = store} UserFeature{..} packageInPath dpath = maybe mzero return (lookup "package" dpath >>= fromReqURI) + tagInPath dpath = maybe mzero return (lookup "tag" dpath >>= fromReqURI) + packageTarballInPath dpath = do PackageIdentifier name version <- packageInPath dpath case lookup "tarball" dpath >>= fromReqURI of diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index c510569b9..3831820b8 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -63,7 +63,7 @@ import qualified Data.Map as Map import Data.Set (Set) import qualified Data.Set as Set import qualified Data.Vector as Vec -import Data.Maybe (fromMaybe, isJust, fromJust) +import Data.Maybe (fromMaybe, isJust) import Data.Monoid ((<>)) import qualified Data.Text as T import Data.Traversable (traverse) @@ -1476,10 +1476,11 @@ mkHtmlTags :: HtmlUtilities mkHtmlTags HtmlUtilities{..} CoreFeature{ coreResource = CoreResource{ packageInPath + , tagInPath , lookupPackageName } } - UploadFeature{guardAuthorisedAsUploaderOrMaintainerOrTrustee} + UploadFeature{guardAuthorisedAsUploaderOrMaintainerOrTrustee,guardAuthorisedAsTrustee} ListFeature{makeItemList} TagsFeature{..} templates @@ -1501,6 +1502,12 @@ mkHtmlTags HtmlUtilities{..} , (extendResource $ packageTagsListing tags) { resourcePut = [("html", putPackageTags)], resourceGet = [("html", showPackageTags)] } + , (extendResource $ tagAliasEdit tags) { + resourcePut = [("html", putAliasEdit)] + } + , (extendResource $ tagAliasEditForm tags) { + resourceGet = [("html", serveAliasForm)] + } , tagEdit -- (extendResource $ packageTagsEdit tags) { resourceGet = [("html", serveTagsForm)] } ] @@ -1522,8 +1529,32 @@ mkHtmlTags HtmlUtilities{..} ] tagItem tg = anchor ! [href $ tagUri tags "" tg] << display tg + putAliasEdit :: DynamicPath -> ServerPartE Response + putAliasEdit dpath = do + let tagname = snd (dpath !! 0) + mergeTags (Tag tagname) + return $ toResponse $ Resource.XHtml $ hackagePage ("Merged Tag " ++ tagname) $ + [ paragraph << ["Return to"] + , anchor ! [href "/packages/tags"] << tagname + ] + + serveAliasForm :: DynamicPath -> ServerPartE Response + serveAliasForm dpath = do + tagname <- tagInPath dpath + guardAuthorisedAsTrustee + let aliasForm = [ h2 << ("Merge Tag " ++ tagname) + , form ! [theclass "box", XHtml.method "post", action ("/packages/tag/" ++ tagname ++ "/alias")] << + [ hidden "_method" "PUT" + , input ! [value " ", name "tags", identifier "tags"] + , toHtml "Tag(s) to merge with" + , input ! [thetype "submit", value "Merge"] + ] + ] + return $ toResponse $ Resource.XHtml $ hackagePage ("Merge Tag " ++ tagname) $ aliasForm + serveTagListing :: DynamicPath -> ServerPartE Response - serveTagListing dpath = + serveTagListing dpath = do + tagname <- tagInPath dpath withTagPath dpath $ \tg pkgnames -> do let tagd = "Packages tagged " ++ display tg pkgs = Set.toList pkgnames @@ -1537,6 +1568,7 @@ mkHtmlTags HtmlUtilities{..} [] -> toHtml "No packages have this tag." _ -> toHtml [ paragraph << [if count==1 then "1 package has" else show count ++ " packages have", " this tag."] + , anchor ! [href $ tagname ++ "/alias/edit"] << "[Merge tag]" , paragraph ! [theclass "toc"] << [toHtml "Related tags: ", toHtml $ showHistogram histogram] , ulist ! [theclass "packages"] << map renderItem items ] ] diff --git a/Distribution/Server/Features/Tags.hs b/Distribution/Server/Features/Tags.hs index b8b9e5bf1..5f234f23d 100644 --- a/Distribution/Server/Features/Tags.hs +++ b/Distribution/Server/Features/Tags.hs @@ -32,7 +32,7 @@ import Distribution.PackageDescription import Distribution.PackageDescription.Configuration import Distribution.License -import Data.Maybe(fromMaybe) +import Data.Maybe(fromMaybe, fromJust) import Data.Set (Set) import qualified Data.Set as Set import Data.Map (Map) @@ -50,6 +50,7 @@ data TagsFeature = TagsFeature { queryGetTagList :: forall m. MonadIO m => m [(Tag, Set PackageName)], queryTagsForPackage :: forall m. MonadIO m => PackageName -> m (Set Tag), queryReviewTagsForPackage :: forall m. MonadIO m => PackageName -> m (Maybe (Set Tag,Set Tag)), + queryAliasForTag :: MonadIO m => Tag -> m (Maybe Tag), -- All package names that were modified, and all tags that were modified -- In almost all cases, one of these will be a singleton. Happstack @@ -68,7 +69,8 @@ data TagsFeature = TagsFeature { withTagPath :: forall a. DynamicPath -> (Tag -> Set PackageName -> ServerPartE a) -> ServerPartE a, collectTags :: forall m. MonadIO m => Set PackageName -> m (Map PackageName (Set Tag)), - putTags :: PackageName -> ServerPartE () + putTags :: PackageName -> ServerPartE (), + mergeTags :: Tag -> ServerPartE () } @@ -80,6 +82,8 @@ data TagsResource = TagsResource { tagListing :: Resource, packageTagsListing :: Resource, packageTagsEdit :: Resource, + tagAliasEdit :: Resource, + tagAliasEditForm :: Resource, tagUri :: String -> Tag -> String, tagsUri :: String -> String, @@ -93,20 +97,23 @@ initTagsFeature :: ServerEnv initTagsFeature ServerEnv{serverStateDir} = do tagsState <- tagsStateComponent serverStateDir tagsReview <- tagsReviewComponent serverStateDir + tagAlias <- tagsAliasComponent serverStateDir specials <- newMemStateWHNF emptyPackageTags updateTag <- newHook return $ \core@CoreFeature{..} upload -> do - let feature = tagsFeature core upload tagsState tagsReview specials updateTag + let feature = tagsFeature core upload tagsState tagsReview tagAlias specials updateTag registerHookJust packageChangeHook isPackageChangeAny $ \(pkgid, mpkginfo) -> case mpkginfo of Nothing -> return () Just pkginfo -> do let pkgname = packageName pkgid - tags = Set.fromList . constructImmutableTags . pkgDesc $ pkginfo - updateState tagsState . SetPackageTags pkgname $ tags - runHook_ updateTag (Set.singleton pkgname, tags) + tags = constructImmutableTags . pkgDesc $ pkginfo + aliases <- sequence $ map (\tag -> queryState tagAlias $ GetTagAlias tag) tags + let newtags = Set.fromList $ map fromJust aliases + updateState tagsState . SetPackageTags pkgname $ newtags + runHook_ updateTag (Set.singleton pkgname, newtags) return feature @@ -123,6 +130,20 @@ tagsStateComponent stateDir = do , resetState = tagsStateComponent } +tagsAliasComponent :: FilePath -> IO (StateComponent AcidState TagAlias) +tagsAliasComponent stateDir = do + st <- openLocalStateFrom (stateDir "db" "Tags" "Alias") emptyTagAlias + return StateComponent { + stateDesc = "Tags Alias" + , stateHandle = st + , getState = query st GetTagAliasesState + , putState = update st . AddTagAliasesState + -- , backupState = \_ pkgTags -> [csvToBackup ["tags.csv"] $ tagsToCSV pkgTags] + -- , restoreState = tagsBackup + -- , resetState = tagsStateComponent + } + + tagsReviewComponent :: FilePath -> IO (StateComponent AcidState ReviewTags) tagsReviewComponent stateDir = do st <- openLocalStateFrom (stateDir "db" "Tags" "Review") emptyReviewTags @@ -142,6 +163,7 @@ tagsFeature :: CoreFeature -> UploadFeature -> StateComponent AcidState PackageTags -> StateComponent AcidState ReviewTags + -> StateComponent AcidState TagAlias -> MemState PackageTags -> Hook (Set PackageName, Set Tag) () -> TagsFeature @@ -152,6 +174,7 @@ tagsFeature CoreFeature{ queryGetPackageIndex UploadFeature{ guardAuthorisedAsUploaderOrMaintainerOrTrustee } tagsState tagsReview + tagsAlias calculatedTags tagsUpdated = TagsFeature{..} @@ -159,6 +182,8 @@ tagsFeature CoreFeature{ queryGetPackageIndex tagsResource = fix $ \r -> TagsResource { tagsListing = resourceAt "/packages/tags/.:format" , tagListing = resourceAt "/packages/tag/:tag.:format" + , tagAliasEdit = resourceAt "/packages/tag/:tag/alias" + , tagAliasEditForm = resourceAt "/packages/tag/:tag/alias/edit" , packageTagsListing = resourceAt "/package/:package/tags.:format" , packageTagsEdit = resourceAt "/package/:package/tags/edit" , tagUri = \format tag -> renderResource (tagListing r) [display tag, format] @@ -200,6 +225,9 @@ tagsFeature CoreFeature{ queryGetPackageIndex queryTagsForPackage :: MonadIO m => PackageName -> m (Set Tag) queryTagsForPackage pkgname = queryState tagsState (TagsForPackage pkgname) + queryAliasForTag :: MonadIO m => Tag -> m (Maybe Tag) + queryAliasForTag tag = queryState tagsAlias (GetTagAlias tag) + queryReviewTagsForPackage :: MonadIO m => PackageName -> m (Maybe (Set Tag,Set Tag)) queryReviewTagsForPackage pkgname = queryState tagsReview (LookupReviewTags pkgname) @@ -221,6 +249,29 @@ tagsFeature CoreFeature{ queryGetPackageIndex pkgMap <- liftM packageTags $ queryState tagsState GetPackageTags return $ Map.fromDistinctAscList . map (\pkg -> (pkg, Map.findWithDefault Set.empty pkg pkgMap)) $ Set.toList pkgs + + mergeTags :: Tag -> ServerPartE () + mergeTags deprTag = do + tags <- optional $ look "tags" + index <- queryGetPackageIndex + case simpleParse =<< tags of + Just (Tag orig) -> do + void $ updateState tagsAlias $ AddTagAlias (Tag orig) deprTag + void $ constructMergedTagIndex (Tag orig) deprTag index + _ -> errBadRequest "Tag not recognised" [MText "Couldn't parse tag. It should be a single tag."] + + -- tags on merging + constructMergedTagIndex :: forall m. MonadIO m => Tag -> Tag -> PackageIndex PkgInfo -> m (PackageTags) + constructMergedTagIndex orig depr = foldM addToTags emptyPackageTags . PackageIndex.allPackagesByName + where addToTags calcTags pkgList = do + let info = pkgDesc $ last pkgList + !pn = packageName info + pkgTags <- queryTagsForPackage pn + let newTags = if (depr `elem` pkgTags) then (Set.delete depr (Set.insert orig pkgTags)) else pkgTags + void $ updateState tagsState $ SetPackageTags pn newTags + runHook_ tagsUpdated (Set.singleton pn, newTags) + return (setTags pn newTags calcTags) + putTags :: PackageName -> ServerPartE () putTags pkgname = do guardValidPackageName pkgname @@ -235,16 +286,20 @@ tagsFeature CoreFeature{ queryGetPackageIndex user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname case user of "Uploaders" -> do + aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) add calcTags <- queryTagsForPackage pkgname - let addTags = Set.fromList add `Set.difference` calcTags + let add_ = map fromJust aliases + addTags = Set.fromList add_ `Set.difference` calcTags delTags = Set.fromList del `Set.intersection` calcTags void $ updateState tagsReview $ InsertReviewTags pkgname addTags delTags return () _ -> do calcTags <- queryTagsForPackage pkgname + aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) add revTags <- queryReviewTagsForPackage pkgname let tagSet = (addTags `Set.union` calcTags) `Set.difference` delTags - addTags = Set.fromList add + add_ = map fromJust aliases + addTags = Set.fromList add_ delTags = Set.fromList del rdel = case simpleParse =<< rdelns of Just (TagList rdel) -> rdel @@ -282,6 +337,8 @@ constructImmutableTagIndex = foldl' addToTags emptyPackageTags . PackageIndex.al !tags = constructImmutableTags info in setTags pn (Set.fromList tags) calcTags + + -- These are constructed when a package is uploaded/on startup constructCategoryTags :: PackageDescription -> [Tag] constructCategoryTags = map (tagify . map toLower) . fillMe . categorySplit . category diff --git a/Distribution/Server/Features/Tags/State.hs b/Distribution/Server/Features/Tags/State.hs index efa702f8d..af2c17250 100644 --- a/Distribution/Server/Features/Tags/State.hs +++ b/Distribution/Server/Features/Tags/State.hs @@ -70,12 +70,39 @@ data PackageTags = PackageTags { -- Packagename (Proposed Additions, Proposed Deletions) data ReviewTags = ReviewTags (Map PackageName (Set Tag, Set Tag)) deriving (Eq, Show) +data TagAlias = TagAlias (Map Tag (Set Tag)) + +addTagAlias :: Tag -> Tag -> Update TagAlias () +addTagAlias tag alias= do + TagAlias m <- get + put (TagAlias (Map.insertWith (Set.union) tag (Set.singleton alias) m)) + +lookupTagAlias :: Tag -> Query TagAlias (Maybe (Set Tag)) +lookupTagAlias tag + = do TagAlias m <- ask + return (Map.lookup tag m) + +getTagAlias :: Tag -> Query TagAlias (Maybe Tag) +getTagAlias tag + = do TagAlias m <- ask + return (canonical tag m) where + canonical tag m + | tag `elem` (Map.keys m) = Just tag + | tag `elem` (foldr Set.union Set.empty $ Map.elems m) = Just (lookupKey tag m) + | otherwise = Just tag + where + lookupKey key m = (Map.keys $ Map.filter (tag `elem` ) m) !! 0 + emptyPackageTags :: PackageTags emptyPackageTags = PackageTags Map.empty Map.empty emptyReviewTags :: ReviewTags emptyReviewTags = ReviewTags Map.empty +emptyTagAlias :: TagAlias +emptyTagAlias = TagAlias Map.empty + + tagToPackages :: Tag -> PackageTags -> Set PackageName tagToPackages tag = Map.findWithDefault Set.empty tag . tagPackages @@ -95,7 +122,6 @@ alterTags name mtagList (PackageTags tags packages) = setTags :: PackageName -> Set Tag -> PackageTags -> PackageTags setTags pkgname tagList = alterTags pkgname (keepSet tagList) - deletePackageTags :: PackageName -> PackageTags -> PackageTags deletePackageTags name = alterTags name Nothing @@ -150,7 +176,7 @@ renameTag tag tag' pkgTags@(PackageTags _ packages) = $(deriveSafeCopy 0 'base ''Tag) $(deriveSafeCopy 0 'base ''PackageTags) $(deriveSafeCopy 0 'base ''ReviewTags) - +$(deriveSafeCopy 0 'base ''TagAlias) instance NFData PackageTags where rnf (PackageTags a b) = rnf a `seq` rnf b @@ -182,6 +208,13 @@ getReviewTags = ask replaceReviewTags :: ReviewTags -> Update ReviewTags () replaceReviewTags = put +getTagAliasesState :: Query TagAlias TagAlias +getTagAliasesState = ask + +addTagAliasesState :: TagAlias -> Update TagAlias () +addTagAliasesState = put + + setPackageTags :: PackageName -> Set Tag -> Update PackageTags () setPackageTags name tagList = modify $ setTags name tagList @@ -247,6 +280,12 @@ $(makeAcidic ''ReviewTags ['insertReviewTags ,'replaceReviewTags ]) +$(makeAcidic ''TagAlias ['addTagAlias + ,'getTagAlias + ,'lookupTagAlias + ,'addTagAliasesState + ,'getTagAliasesState + ]) $(makeAcidic ''PackageTags ['tagsForPackage ,'packagesForTag @@ -259,3 +298,4 @@ $(makeAcidic ''PackageTags ['tagsForPackage ,'removePackageTag ]) + diff --git a/Distribution/Server/Features/Upload.hs b/Distribution/Server/Features/Upload.hs index 00d43b296..ab9e38ec4 100644 --- a/Distribution/Server/Features/Upload.hs +++ b/Distribution/Server/Features/Upload.hs @@ -61,6 +61,7 @@ data UploadFeature = UploadFeature { -- | Requiring being logged in as the maintainer of a package. guardAuthorisedAsUploaderOrMaintainerOrTrustee :: PackageName -> ServerPartE String, guardAuthorisedAsMaintainer :: PackageName -> ServerPartE (), + guardAuthorisedAsTrustee :: ServerPartE (), -- | Requiring being logged in as the maintainer of a package or a trustee. guardAuthorisedAsMaintainerOrTrustee :: PackageName -> ServerPartE (), @@ -299,6 +300,10 @@ uploadFeature ServerEnv{serverBlobStore = store} guardAuthorisedAsMaintainer pkgname = guardAuthorised_ [InGroup (maintainersGroup pkgname)] + guardAuthorisedAsTrustee :: ServerPartE () + guardAuthorisedAsTrustee = + guardAuthorised_ [InGroup trusteesGroup] + guardAuthorisedAsUploaderOrMaintainerOrTrustee :: PackageName -> ServerPartE String guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname= do mt <- guardAuthorised' [InGroup (maintainersGroup pkgname), InGroup trusteesGroup] From 5c132ebe0bc29b28e6632f696dbcf7e77cbbbf16 Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Tue, 21 Jun 2016 13:00:21 +0530 Subject: [PATCH 05/39] Cleaning up earlier code Added backup functions for tag alias Fixed tag aliasing bug on startup --- Distribution/Server/Features/Html.hs | 125 ++++++------------ .../Server/Features/Html/HtmlUtilities.hs | 20 +++ Distribution/Server/Features/PackageList.hs | 7 +- Distribution/Server/Features/Tags.hs | 100 ++++++-------- Distribution/Server/Features/Tags/Backup.hs | 33 ++++- Distribution/Server/Features/Tags/State.hs | 113 +++++++--------- Distribution/Server/Features/Upload.hs | 24 ++-- Distribution/Server/Features/Users.hs | 6 +- Distribution/Server/Features/Votes.hs | 2 +- datafiles/static/hackage.css | 2 + datafiles/templates/Html/tag-edit.html.st | 30 +++-- datafiles/templates/index.html.st | 1 + hackage-server.cabal | 18 ++- 13 files changed, 235 insertions(+), 246 deletions(-) diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 3831820b8..45501ed8b 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -440,8 +440,7 @@ htmlFeature env@ServerEnv{..} {------------------------------------------------------------------------------- Core ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlCore = HtmlCore { htmlCoreResources :: [Resource] @@ -519,10 +518,10 @@ mkHtmlCore ServerEnv{serverBaseURI} , (resourceAt "/packages/names" ) { resourceGet = [("html", const $ readAsyncCache cacheNamesPage)] } - , (resourceAt "/packages/names/experiment" ) { + , (resourceAt "/packages/names/tags" ) { resourceDesc = [(GET, "Show detailed package dependency information")] , resourceGet = [("html", - serveMaintainPage')] + serveTagIndex)] } , (extendResource $ corePackagesPage cores) { resourceDesc = [(GET, "Show package index")] @@ -621,13 +620,13 @@ mkHtmlCore ServerEnv{serverBaseURI} , "versions" $= map packageId pkgs ] - serveMaintainPage' :: DynamicPath -> ServerPartE Response - serveMaintainPage' _ = do + serveTagIndex :: DynamicPath -> ServerPartE Response + serveTagIndex _ = do pkgIndex <- queryGetPackageIndex let packageNames = Pages.toPackageNames pkgIndex pkgDetails <- liftIO $ makeItemList packageNames let rowList = map (makeRow) pkgDetails - tabledata = "" +++ rowList +++"" + tabledata = "" +++ rowList +++ "" template <- getTemplate templates "tag-interface.html" return $ toResponse $ template [ "tabledata" $= tabledata ] @@ -683,8 +682,7 @@ mkHtmlCore ServerEnv{serverBaseURI} {------------------------------------------------------------------------------- Users ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlUsers = HtmlUsers { htmlUsersResources :: [Resource] @@ -798,8 +796,7 @@ mkHtmlUsers UserFeature{..} UserDetailsFeature{..} = HtmlUsers{..} {------------------------------------------------------------------------------- Uploads ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlUploads = HtmlUploads { htmlUploadsResources :: [Resource] @@ -847,8 +844,7 @@ mkHtmlUploads HtmlUtilities{..} UploadFeature{..} = HtmlUploads{..} {------------------------------------------------------------------------------- Documentation uploads ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlDocUploads = HtmlDocUploads { htmlDocUploadsResources :: [Resource] @@ -895,8 +891,7 @@ mkHtmlDocUploads HtmlUtilities{..} CoreFeature{coreResource} DocumentationFeatur {------------------------------------------------------------------------------- Build reports ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlReports = HtmlReports { htmlReportsResources :: [Resource] @@ -942,8 +937,7 @@ mkHtmlReports HtmlUtilities{..} CoreFeature{..} ReportsFeature{..} templates = H {------------------------------------------------------------------------------- Candidates ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlCandidates = HtmlCandidates { htmlCandidatesResources :: [Resource] @@ -1200,8 +1194,7 @@ dependenciesPage isCandidate render = {------------------------------------------------------------------------------- Preferred versions ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlPreferred = HtmlPreferred { htmlPreferredResources :: [Resource] @@ -1419,8 +1412,7 @@ mkHtmlPreferred HtmlUtilities{..} {------------------------------------------------------------------------------- Downloads ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlDownloads = HtmlDownloads { htmlDownloadsResources :: [Resource] @@ -1458,8 +1450,7 @@ mkHtmlDownloads HtmlUtilities{..} DownloadFeature{..} = HtmlDownloads{..} {------------------------------------------------------------------------------- Tags ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlTags = HtmlTags { htmlTagsResources :: [Resource] @@ -1480,7 +1471,7 @@ mkHtmlTags HtmlUtilities{..} , lookupPackageName } } - UploadFeature{guardAuthorisedAsUploaderOrMaintainerOrTrustee,guardAuthorisedAsTrustee} + UploadFeature{authorisedAsAnyUser, authorisedAsMaintainerOrTrustee, guardAuthorisedAsTrustee} ListFeature{makeItemList} TagsFeature{..} templates @@ -1533,21 +1524,24 @@ mkHtmlTags HtmlUtilities{..} putAliasEdit dpath = do let tagname = snd (dpath !! 0) mergeTags (Tag tagname) - return $ toResponse $ Resource.XHtml $ hackagePage ("Merged Tag " ++ tagname) $ - [ paragraph << ["Return to"] - , anchor ! [href "/packages/tags"] << tagname + return $ toResponse $ Resource.XHtml $ hackagePage "Merged Tag" $ + [ h2 << "Merged tag" + , toHtml "Return to " + , anchor ! [href $ "/packages/tags"] << "tag listings" ] serveAliasForm :: DynamicPath -> ServerPartE Response serveAliasForm dpath = do tagname <- tagInPath dpath guardAuthorisedAsTrustee - let aliasForm = [ h2 << ("Merge Tag " ++ tagname) - , form ! [theclass "box", XHtml.method "post", action ("/packages/tag/" ++ tagname ++ "/alias")] << - [ hidden "_method" "PUT" - , input ! [value " ", name "tags", identifier "tags"] - , toHtml "Tag(s) to merge with" - , input ! [thetype "submit", value "Merge"] + let aliasForm = [ thediv ! [theclass "box"] << + [h2 << ("Merge Tag " ++ tagname) + , form ! [XHtml.method "post", action ("/packages/tag/" ++ tagname ++ "/alias")] << + [ hidden "_method" "PUT" + , input ! [value "", name "tags", identifier "tags"] + , toHtml " (Tag to merge with) ", br + , input ! [thetype "submit", value "Merge"] + ] ] ] return $ toResponse $ Resource.XHtml $ hackagePage ("Merge Tag " ++ tagname) $ aliasForm @@ -1588,40 +1582,16 @@ mkHtmlTags HtmlUtilities{..} putTags pkgname currTags <- queryTagsForPackage pkgname revTags <- queryReviewTagsForPackage pkgname - let toStr = concat . intersperse ", " . map display . Set.toList - tagsStr = toStr currTags - addns = toStr $ fst $ fromMaybe (Set.empty, Set.empty) revTags - delns = toStr $ snd $ fromMaybe (Set.empty, Set.empty) revTags - disp = thediv ! [theclass "box"] << [ paragraph << [bold $ toHtml "Current Tags: ", toHtml tagsStr, br], - paragraph << [bold $ toHtml "Additions to be reviewed: ", toHtml addns, br], - paragraph << [bold $ toHtml "Deletions to be reviewed: ", toHtml delns, br] - ] - - return $ toResponse $ Resource.XHtml $ hackagePage "Package Tags" [ big $ bold $ toHtml $ display pkgname - , disp - , anchor ![href $ "tags/edit" ] << "Propose a tag?", toHtml " or " - , toHtml "return to ", packageNameLink pkgname, br - ] + let disp = renderReviewTags currTags revTags pkgname + return $ toResponse $ Resource.XHtml $ hackagePage "Package Tags" disp showPackageTags :: DynamicPath -> ServerPartE Response showPackageTags dpath = do pkgname <- packageInPath dpath currTags <- queryTagsForPackage pkgname revTags <- queryReviewTagsForPackage pkgname - let toStr = concat . intersperse ", " . map display . Set.toList - tagsStr = toStr currTags - addns = toStr $ fst $ fromMaybe (Set.empty, Set.empty) revTags - delns = toStr $ snd $ fromMaybe (Set.empty, Set.empty) revTags - disp = thediv ! [theclass "box"] << [ paragraph << [bold $ toHtml "Current Tags: ", toHtml tagsStr, br], - paragraph << [bold $ toHtml "Additions to be reviewed: ", toHtml addns, br], - paragraph << [bold $ toHtml "Deletions to be reviewed: ", toHtml delns, br] - ] - - return $ toResponse $ Resource.XHtml $ hackagePage "Package Tags" [ big $ bold $ toHtml $ display pkgname - , disp - , anchor ![href $ "tags/edit" ] << "Propose a tag?", toHtml " or " - , toHtml "return to ", packageNameLink pkgname, br - ] + let disp = renderReviewTags currTags revTags pkgname + return $ toResponse $ Resource.XHtml $ hackagePage "Package Tags" disp -- serve form for editing, to be received by putTags serveTagsForm :: DynamicPath -> ServerPartE Response @@ -1632,33 +1602,27 @@ mkHtmlTags HtmlUtilities{..} template <- getTemplate templates "tag-edit.html" let toStr = concat . intersperse ", " . map display . Set.toList tagsStr = toStr currTags - addns = toStr $ fst $ fromMaybe (Set.empty,Set.empty) revTags - delns = toStr $ snd $ fromMaybe (Set.empty, Set.empty) revTags - - - user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname - case user of - "Uploaders" -> return $ toResponse . template $ - [ "pkgname" $= display pkgname - , "addns" $= addns - , "tags" $= (tagsStr) - , "delns" $= delns - , "isuser" $= "true" - ] - _ -> return $toResponse . template $ + addns = toStr $ fst revTags + delns = toStr $ snd revTags + trustainer <- authorisedAsMaintainerOrTrustee pkgname + user <- authorisedAsAnyUser + if trustainer || user + then return $ toResponse . template $ [ "pkgname" $= display pkgname , "addns" $= addns - , "tags" $= (tagsStr) + , "tags" $= tagsStr , "delns" $= delns - , "istrustee" $= "false" + , "istrustee" $= trustainer + , "isuser" $= if trustainer then False else True ] + else return $ toResponse $ Resource.XHtml $ hackagePage "Error" $ [h2 << "Authorization Error" + , paragraph << "You need to be logged in to propose tags"] {------------------------------------------------------------------------------- Search ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} data HtmlSearch = HtmlSearch { htmlSearchResources :: [Resource] @@ -1917,8 +1881,7 @@ mkHtmlSearch HtmlUtilities{..} {------------------------------------------------------------------------------- Groups ------------------------------------------------------------------------------ --} +-------------------------------------------------------------------------------} htmlGroupResource :: UserFeature -> GroupResource -> [Resource] htmlGroupResource UserFeature{..} r@(GroupResource groupR userR getGroup) = diff --git a/Distribution/Server/Features/Html/HtmlUtilities.hs b/Distribution/Server/Features/Html/HtmlUtilities.hs index da928faa1..ae0aa619e 100644 --- a/Distribution/Server/Features/Html/HtmlUtilities.hs +++ b/Distribution/Server/Features/Html/HtmlUtilities.hs @@ -11,6 +11,7 @@ import Distribution.Server.Features.Core import Distribution.Text (display) import Data.List (intersperse) import Data.Set (Set) +import Data.Maybe (fromMaybe) import Distribution.Server.Features.PackageList import Distribution.Server.Pages.Util (packageType) import Distribution.Package @@ -21,6 +22,7 @@ data HtmlUtilities = HtmlUtilities { , renderItem :: PackageItem -> Html , makeRow :: PackageItem -> Html , renderTags :: Set Tag -> [Html] + , renderReviewTags :: Set Tag -> (Set Tag, Set Tag) -> PackageName -> [Html] } htmlUtilities :: CoreFeature -> TagsFeature -> HtmlUtilities @@ -61,4 +63,22 @@ htmlUtilities CoreFeature{coreResource} (map (\tg -> anchor ! [href $ tagUri tagsResource "" tg] << display tg) $ Set.toList tags) + -- The page displayed at /package/:package/tags + renderReviewTags :: Set Tag -> (Set Tag, Set Tag) -> PackageName -> [Html] + renderReviewTags currTags revTags pkgname= + let toStr = concat . intersperse ", " . map display . Set.toList + tagsStr = toStr currTags + addns = toStr $ fst revTags + delns = toStr $ snd revTags + disp = thediv ! [theclass "box"] << [ paragraph << [bold $ toHtml "Current Tags: ", toHtml tagsStr, br] + , paragraph << [bold $ toHtml "Additions to be reviewed: ", toHtml $ if (addns /= "") then addns else "None", br] + , paragraph << [bold $ toHtml "Deletions to be reviewed: ", toHtml $ if (delns /= "") then delns else "None", br] + ] + in + [ big $ bold $ toHtml $ display pkgname + , disp + , anchor ![href $ "tags/edit" ] << "Propose a tag?", toHtml " or " + , toHtml "return to ", packageNameLink pkgname, br + ] + cores = coreResource diff --git a/Distribution/Server/Features/PackageList.hs b/Distribution/Server/Features/PackageList.hs index 3b506516d..8ecc71f2c 100644 --- a/Distribution/Server/Features/PackageList.hs +++ b/Distribution/Server/Features/PackageList.hs @@ -60,11 +60,11 @@ data PackageItem = PackageItem { itemMaintainer :: !String, -- Whether the item is in the Haskell Platform --itemPlatform :: Bool, - -- Author of the package (Probably won't be used in display) - itemVotes :: Int, + -- Number of votes for the package + itemVotes :: !Int, -- The total number of downloads. (For sorting, not displaying.) -- Updated periodically. - itemDownloads :: Int, + itemDownloads :: !Int, -- The number of direct revdeps. (Likewise.) -- also: distinguish direct/flat? -- [reverse index disabled] itemRevDepsCount :: !Int, @@ -251,7 +251,6 @@ updateDescriptionItem genDesc item = -- This checks if the library is buildable. However, since -- desc is flattened, we might miss some flags. Perhaps use the -- CondTree instead. - -- itemAuthor = author desc, itemMaintainer = maintainer desc, itemHasLibrary = hasLibs desc, itemNumExecutables = length . filter (buildable . buildInfo) $ executables desc, diff --git a/Distribution/Server/Features/Tags.hs b/Distribution/Server/Features/Tags.hs index 5f234f23d..7341eea03 100644 --- a/Distribution/Server/Features/Tags.hs +++ b/Distribution/Server/Features/Tags.hs @@ -17,9 +17,9 @@ import Distribution.Server.Framework.BackupDump import Distribution.Server.Features.Tags.State import Distribution.Server.Features.Tags.Backup -import Distribution.Server.Features.Users( guardAuthorised' ) import Distribution.Server.Features.Core import Distribution.Server.Features.Upload +import Distribution.Server.Framework.BackupRestore import qualified Distribution.Server.Packages.PackageIndex as PackageIndex import Distribution.Server.Packages.PackageIndex (PackageIndex) @@ -32,7 +32,6 @@ import Distribution.PackageDescription import Distribution.PackageDescription.Configuration import Distribution.License -import Data.Maybe(fromMaybe, fromJust) import Data.Set (Set) import qualified Data.Set as Set import Data.Map (Map) @@ -49,8 +48,8 @@ data TagsFeature = TagsFeature { queryGetTagList :: forall m. MonadIO m => m [(Tag, Set PackageName)], queryTagsForPackage :: forall m. MonadIO m => PackageName -> m (Set Tag), - queryReviewTagsForPackage :: forall m. MonadIO m => PackageName -> m (Maybe (Set Tag,Set Tag)), - queryAliasForTag :: MonadIO m => Tag -> m (Maybe Tag), + queryReviewTagsForPackage :: forall m. MonadIO m => PackageName -> m (Set Tag,Set Tag), + queryAliasForTag :: forall m. MonadIO m => Tag -> m Tag, -- All package names that were modified, and all tags that were modified -- In almost all cases, one of these will be a singleton. Happstack @@ -68,7 +67,6 @@ data TagsFeature = TagsFeature { withTagPath :: forall a. DynamicPath -> (Tag -> Set PackageName -> ServerPartE a) -> ServerPartE a, collectTags :: forall m. MonadIO m => Set PackageName -> m (Map PackageName (Set Tag)), - putTags :: PackageName -> ServerPartE (), mergeTags :: Tag -> ServerPartE () @@ -96,13 +94,12 @@ initTagsFeature :: ServerEnv -> IO TagsFeature) initTagsFeature ServerEnv{serverStateDir} = do tagsState <- tagsStateComponent serverStateDir - tagsReview <- tagsReviewComponent serverStateDir tagAlias <- tagsAliasComponent serverStateDir specials <- newMemStateWHNF emptyPackageTags updateTag <- newHook return $ \core@CoreFeature{..} upload -> do - let feature = tagsFeature core upload tagsState tagsReview tagAlias specials updateTag + let feature = tagsFeature core upload tagsState tagAlias specials updateTag registerHookJust packageChangeHook isPackageChangeAny $ \(pkgid, mpkginfo) -> case mpkginfo of @@ -111,7 +108,7 @@ initTagsFeature ServerEnv{serverStateDir} = do let pkgname = packageName pkgid tags = constructImmutableTags . pkgDesc $ pkginfo aliases <- sequence $ map (\tag -> queryState tagAlias $ GetTagAlias tag) tags - let newtags = Set.fromList $ map fromJust aliases + let newtags = Set.fromList aliases updateState tagsState . SetPackageTags pkgname $ newtags runHook_ updateTag (Set.singleton pkgname, newtags) @@ -138,31 +135,14 @@ tagsAliasComponent stateDir = do , stateHandle = st , getState = query st GetTagAliasesState , putState = update st . AddTagAliasesState - -- , backupState = \_ pkgTags -> [csvToBackup ["tags.csv"] $ tagsToCSV pkgTags] - -- , restoreState = tagsBackup - -- , resetState = tagsStateComponent - } - - -tagsReviewComponent :: FilePath -> IO (StateComponent AcidState ReviewTags) -tagsReviewComponent stateDir = do - st <- openLocalStateFrom (stateDir "db" "Tags" "Review") emptyReviewTags - return StateComponent { - stateDesc = "Review tags" - , stateHandle = st - , getState = query st GetReviewTags - , putState = update st . ReplaceReviewTags - -- , backupState = \_ pkgTags -> [csvToBackup ["tags.csv"] $ tagsToCSV pkgTags] - -- , restoreState = tagsBackup - -- , resetState = tagsStateComponent + , backupState = \_ aliases -> [csvToBackup ["aliases.csv"] $ aliasToCSV aliases] + , restoreState = aliasBackup + , resetState = tagsAliasComponent } - - tagsFeature :: CoreFeature -> UploadFeature -> StateComponent AcidState PackageTags - -> StateComponent AcidState ReviewTags -> StateComponent AcidState TagAlias -> MemState PackageTags -> Hook (Set PackageName, Set Tag) () @@ -171,9 +151,8 @@ tagsFeature :: CoreFeature tagsFeature CoreFeature{ queryGetPackageIndex , coreResource = CoreResource { guardValidPackageName } } - UploadFeature{ guardAuthorisedAsUploaderOrMaintainerOrTrustee } + UploadFeature{authorisedAsAnyUser, authorisedAsMaintainerOrTrustee} tagsState - tagsReview tagsAlias calculatedTags tagsUpdated @@ -217,7 +196,9 @@ tagsFeature CoreFeature{ queryGetPackageIndex initImmutableTags = do index <- queryGetPackageIndex let calcTags = tagPackages $ constructImmutableTagIndex index - forM_ (Map.toList calcTags) $ uncurry setCalculatedTag + aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) $ Map.keys calcTags + let calcTags' = Map.toList . Map.fromListWith (Set.union) $ zip aliases (Map.elems calcTags) + forM_ calcTags' $ uncurry setCalculatedTag queryGetTagList :: MonadIO m => m [(Tag, Set PackageName)] queryGetTagList = queryState tagsState GetTagList @@ -225,11 +206,11 @@ tagsFeature CoreFeature{ queryGetPackageIndex queryTagsForPackage :: MonadIO m => PackageName -> m (Set Tag) queryTagsForPackage pkgname = queryState tagsState (TagsForPackage pkgname) - queryAliasForTag :: MonadIO m => Tag -> m (Maybe Tag) + queryAliasForTag :: MonadIO m => Tag -> m Tag queryAliasForTag tag = queryState tagsAlias (GetTagAlias tag) - queryReviewTagsForPackage :: MonadIO m => PackageName -> m (Maybe (Set Tag,Set Tag)) - queryReviewTagsForPackage pkgname = queryState tagsReview (LookupReviewTags pkgname) + queryReviewTagsForPackage :: MonadIO m => PackageName -> m (Set Tag,Set Tag) + queryReviewTagsForPackage pkgname = queryState tagsState (LookupReviewTags pkgname) setCalculatedTag :: Tag -> Set PackageName -> IO () setCalculatedTag tag pkgs = do @@ -249,7 +230,6 @@ tagsFeature CoreFeature{ queryGetPackageIndex pkgMap <- liftM packageTags $ queryState tagsState GetPackageTags return $ Map.fromDistinctAscList . map (\pkg -> (pkg, Map.findWithDefault Set.empty pkg pkgMap)) $ Set.toList pkgs - mergeTags :: Tag -> ServerPartE () mergeTags deprTag = do tags <- optional $ look "tags" @@ -261,16 +241,19 @@ tagsFeature CoreFeature{ queryGetPackageIndex _ -> errBadRequest "Tag not recognised" [MText "Couldn't parse tag. It should be a single tag."] -- tags on merging - constructMergedTagIndex :: forall m. MonadIO m => Tag -> Tag -> PackageIndex PkgInfo -> m (PackageTags) + constructMergedTagIndex :: forall m. (Functor m, MonadIO m) => Tag -> Tag -> PackageIndex PkgInfo -> m (PackageTags) constructMergedTagIndex orig depr = foldM addToTags emptyPackageTags . PackageIndex.allPackagesByName where addToTags calcTags pkgList = do let info = pkgDesc $ last pkgList !pn = packageName info pkgTags <- queryTagsForPackage pn - let newTags = if (depr `elem` pkgTags) then (Set.delete depr (Set.insert orig pkgTags)) else pkgTags - void $ updateState tagsState $ SetPackageTags pn newTags - runHook_ tagsUpdated (Set.singleton pn, newTags) - return (setTags pn newTags calcTags) + if (Set.member depr pkgTags) + then do + let newTags = Set.delete depr (Set.insert orig pkgTags) + void $ updateState tagsState $ SetPackageTags pn newTags + runHook_ tagsUpdated (Set.singleton pn, newTags) + return $ setTags pn newTags calcTags + else return $ setTags pn pkgTags calcTags putTags :: PackageName -> ServerPartE () putTags pkgname = do @@ -283,36 +266,37 @@ tagsFeature CoreFeature{ queryGetPackageIndex Just (TagList add) -> do case simpleParse =<< delns of Just (TagList del) -> do - user <- guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname - case user of - "Uploaders" -> do - aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) add - calcTags <- queryTagsForPackage pkgname - let add_ = map fromJust aliases - addTags = Set.fromList add_ `Set.difference` calcTags - delTags = Set.fromList del `Set.intersection` calcTags - void $ updateState tagsReview $ InsertReviewTags pkgname addTags delTags - return () - _ -> do + trustainer <- authorisedAsMaintainerOrTrustee pkgname + user <- authorisedAsAnyUser + if trustainer + then do calcTags <- queryTagsForPackage pkgname aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) add revTags <- queryReviewTagsForPackage pkgname let tagSet = (addTags `Set.union` calcTags) `Set.difference` delTags - add_ = map fromJust aliases - addTags = Set.fromList add_ + addTags = Set.fromList aliases delTags = Set.fromList del - rdel = case simpleParse =<< rdelns of + rdel' = case simpleParse =<< rdelns of Just (TagList rdel) -> rdel Nothing -> [] - radd = case simpleParse =<< raddns of + radd' = case simpleParse =<< raddns of Just (TagList radd) -> radd Nothing -> [] - addRev = Set.difference (fst $ fromMaybe (Set.empty, Set.empty) revTags) (Set.fromList add `Set.union` Set.fromList radd) - delRev = Set.difference (snd $ fromMaybe (Set.empty, Set.empty) revTags) (Set.fromList del `Set.union` Set.fromList rdel) + addRev = Set.difference (fst revTags) (Set.fromList add `Set.union` Set.fromList radd') + delRev = Set.difference (snd revTags) (Set.fromList del `Set.union` Set.fromList rdel') void $ updateState tagsState $ SetPackageTags pkgname tagSet - void $ updateState tagsReview $ InsertReviewTags_ pkgname addRev delRev + void $ updateState tagsState $ InsertReviewTags' pkgname addRev delRev runHook_ tagsUpdated (Set.singleton pkgname, tagSet) return () + else if user + then do + aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) add + calcTags <- queryTagsForPackage pkgname + let addTags = Set.fromList aliases `Set.difference` calcTags + delTags = Set.fromList del `Set.intersection` calcTags + void $ updateState tagsState $ InsertReviewTags pkgname addTags delTags + return () + else errBadRequest "Authorization Error" [MText "You need to be logged in to propose tags"] _ -> errBadRequest "Tags not recognized" [MText "Couldn't parse your tag list. It should be comma separated with any number of alphanumerical tags. Tags can also also have -+#*."] Nothing -> errBadRequest "Tags not recognized" [MText "Couldn't parse your tag list. It should be comma separated with any number of alphanumerical tags. Tags can also also have -+#*."] diff --git a/Distribution/Server/Features/Tags/Backup.hs b/Distribution/Server/Features/Tags/Backup.hs index e9fdac5e1..2e4c0d2e1 100644 --- a/Distribution/Server/Features/Tags/Backup.hs +++ b/Distribution/Server/Features/Tags/Backup.hs @@ -1,7 +1,10 @@ module Distribution.Server.Features.Tags.Backup ( tagsBackup, + aliasBackup, tagsToCSV, - tagsToRecord + aliasToCSV, + tagsToRecord, + aliasToRecord, ) where import Distribution.Server.Features.Tags.State @@ -28,6 +31,19 @@ updateTags tagsState = RestoreBackup { else return (updateTags tagsState) , restoreFinalize = return tagsState } +aliasBackup :: RestoreBackup TagAlias +aliasBackup = updateAlias emptyTagAlias + +updateAlias :: TagAlias -> RestoreBackup TagAlias +updateAlias tagAliases = RestoreBackup { + restoreEntry = \(BackupByteString entry bs) -> + if entry == ["tagAlias.csv"] + then do csv <- importCSV "tagAlias.csv" bs + tagAliases' <- updateFromCSVA csv tagAliases + return (updateAlias tagAliases') + else return (updateAlias tagAliases) + , restoreFinalize = return tagAliases + } updateFromCSV :: CSV -> PackageTags -> Restore PackageTags updateFromCSV = concatM . map fromRecord @@ -39,11 +55,26 @@ updateFromCSV = concatM . map fromRecord return (setTags pkgname (Set.fromList tags) tagsState) fromRecord x _ = fail $ "Invalid tags record: " ++ show x +updateFromCSVA :: CSV -> TagAlias -> Restore TagAlias +updateFromCSVA = concatM . map fromRecord + where + fromRecord :: Record -> TagAlias -> Restore TagAlias + fromRecord (canonical:aliases) tagsAlias | not (null aliases) = do + tag <- parseText "tag" canonical + alias <- mapM (parseText "tag") aliases + return (setAliases tag (Set.fromList alias) tagsAlias) + fromRecord x _ = fail $ "Invalid tags record: " ++ show x + ------------------------------------------------------------------------------ tagsToCSV :: PackageTags -> CSV tagsToCSV = map (\(p, t) -> tagsToRecord p $ Set.toList t) . Map.toList . packageTags +aliasToCSV :: TagAlias -> CSV +aliasToCSV (TagAlias ta) = map (\(t, a) -> aliasToRecord t $ Set.toList a) . Map.toList $ ta + tagsToRecord :: PackageName -> [Tag] -> Record -- [String] tagsToRecord pkgname tags = display pkgname:map display tags +aliasToRecord :: Tag -> [Tag] -> Record -- [String] +aliasToRecord canonical aliases = display canonical:map display aliases diff --git a/Distribution/Server/Features/Tags/State.hs b/Distribution/Server/Features/Tags/State.hs index af2c17250..0bbaca568 100644 --- a/Distribution/Server/Features/Tags/State.hs +++ b/Distribution/Server/Features/Tags/State.hs @@ -63,17 +63,16 @@ data PackageTags = PackageTags { -- the primary index packageTags :: Map PackageName (Set Tag), -- a secondary reverse mapping - tagPackages :: Map Tag (Set PackageName) + tagPackages :: Map Tag (Set PackageName), + -- Packagename (Proposed Additions, Proposed Deletions) + reviewTags :: Map PackageName (Set Tag, Set Tag) } deriving (Eq, Show, Typeable) --- Packagename (Proposed Additions, Proposed Deletions) -data ReviewTags = ReviewTags (Map PackageName (Set Tag, Set Tag)) deriving (Eq, Show) - -data TagAlias = TagAlias (Map Tag (Set Tag)) +data TagAlias = TagAlias (Map Tag (Set Tag)) deriving (Eq, Show, Typeable) addTagAlias :: Tag -> Tag -> Update TagAlias () -addTagAlias tag alias= do +addTagAlias tag alias = do TagAlias m <- get put (TagAlias (Map.insertWith (Set.union) tag (Set.singleton alias) m)) @@ -82,27 +81,21 @@ lookupTagAlias tag = do TagAlias m <- ask return (Map.lookup tag m) -getTagAlias :: Tag -> Query TagAlias (Maybe Tag) +getTagAlias :: Tag -> Query TagAlias Tag getTagAlias tag = do TagAlias m <- ask - return (canonical tag m) where - canonical tag m - | tag `elem` (Map.keys m) = Just tag - | tag `elem` (foldr Set.union Set.empty $ Map.elems m) = Just (lookupKey tag m) - | otherwise = Just tag - where - lookupKey key m = (Map.keys $ Map.filter (tag `elem` ) m) !! 0 + if tag `elem` (Map.keys m) + then return tag + else if tag `Set.member` (foldr Set.union Set.empty $ Map.elems m) + then return $ head (Map.keys $ Map.filter (tag `Set.member`) m) + else return tag emptyPackageTags :: PackageTags -emptyPackageTags = PackageTags Map.empty Map.empty - -emptyReviewTags :: ReviewTags -emptyReviewTags = ReviewTags Map.empty +emptyPackageTags = PackageTags Map.empty Map.empty Map.empty emptyTagAlias :: TagAlias emptyTagAlias = TagAlias Map.empty - tagToPackages :: Tag -> PackageTags -> Set PackageName tagToPackages tag = Map.findWithDefault Set.empty tag . tagPackages @@ -110,35 +103,43 @@ packageToTags :: PackageName -> PackageTags -> Set Tag packageToTags pkg = Map.findWithDefault Set.empty pkg . packageTags alterTags :: PackageName -> Maybe (Set Tag) -> PackageTags -> PackageTags -alterTags name mtagList (PackageTags tags packages) = +alterTags name mtagList pt@(PackageTags tags packages _) = let tagList = fromMaybe Set.empty mtagList oldTags = Map.findWithDefault Set.empty name tags adjustPlusTags pkgMap tag' = addSetMap tag' name pkgMap adjustMinusTags pkgMap tag' = removeSetMap tag' name pkgMap packages' = flip (foldl' adjustPlusTags) (Set.toList $ Set.difference tagList oldTags) $ foldl' adjustMinusTags packages (Set.toList $ Set.difference oldTags tagList) - in PackageTags (Map.alter (const mtagList) name tags) packages' + in pt{ + packageTags = Map.alter (const mtagList) name tags, + tagPackages = packages' + } setTags :: PackageName -> Set Tag -> PackageTags -> PackageTags setTags pkgname tagList = alterTags pkgname (keepSet tagList) +setAliases :: Tag -> Set Tag -> TagAlias -> TagAlias +setAliases tag aliases (TagAlias ta) = TagAlias (Map.insertWith (Set.union) tag aliases ta) + deletePackageTags :: PackageName -> PackageTags -> PackageTags deletePackageTags name = alterTags name Nothing addTag :: PackageName -> Tag -> PackageTags -> Maybe PackageTags -addTag name tag (PackageTags tags packages) = +addTag name tag (PackageTags tags packages review) = let existing = Map.findWithDefault Set.empty name tags in case tag `Set.member` existing of True -> Nothing False -> Just $ PackageTags (addSetMap name tag tags) (addSetMap tag name packages) + review removeTag :: PackageName -> Tag -> PackageTags -> Maybe PackageTags -removeTag name tag (PackageTags tags packages) = +removeTag name tag (PackageTags tags packages review) = let existing = Map.findWithDefault Set.empty name tags in case tag `Set.member` existing of True -> Just $ PackageTags (removeSetMap name tag tags) (removeSetMap tag name packages) + review False -> Nothing addSetMap :: (Ord k, Ord a) => k -> a -> Map k (Set a) -> Map k (Set a) @@ -148,14 +149,14 @@ removeSetMap :: (Ord k, Ord a) => k -> a -> Map k (Set a) -> Map k (Set a) removeSetMap key val = Map.update (keepSet . Set.delete val) key alterTag :: Tag -> Maybe (Set PackageName) -> PackageTags -> PackageTags -alterTag tag mpkgList (PackageTags tags packages) = +alterTag tag mpkgList (PackageTags tags packages review) = let pkgList = fromMaybe Set.empty mpkgList oldPkgs = Map.findWithDefault Set.empty tag packages adjustPlusPkgs tagMap name' = addSetMap name' tag tagMap adjustMinusPkgs tagMap name' = removeSetMap name' tag tagMap tags' = flip (foldl' adjustPlusPkgs) (Set.toList $ Set.difference pkgList oldPkgs) $ foldl' adjustMinusPkgs tags (Set.toList $ Set.difference oldPkgs pkgList) - in PackageTags tags' (Map.alter (const mpkgList) tag packages) + in PackageTags tags' (Map.alter (const mpkgList) tag packages) review keepSet :: Ord a => Set a -> Maybe (Set a) keepSet s = if Set.null s then Nothing else Just s @@ -168,21 +169,20 @@ deleteTag :: Tag -> PackageTags -> PackageTags deleteTag tag = alterTag tag Nothing renameTag :: Tag -> Tag -> PackageTags -> PackageTags -renameTag tag tag' pkgTags@(PackageTags _ packages) = +renameTag tag tag' pkgTags@(PackageTags _ packages _) = let oldPkgs = Map.findWithDefault Set.empty tag packages in setTag tag' oldPkgs . deleteTag tag $ pkgTags ------------------------------------------------------------------------------- $(deriveSafeCopy 0 'base ''Tag) $(deriveSafeCopy 0 'base ''PackageTags) -$(deriveSafeCopy 0 'base ''ReviewTags) $(deriveSafeCopy 0 'base ''TagAlias) instance NFData PackageTags where - rnf (PackageTags a b) = rnf a `seq` rnf b + rnf (PackageTags a b c) = rnf a `seq` rnf b `seq` rnf c instance MemSize PackageTags where - memSize (PackageTags a b) = memSize2 a b + memSize (PackageTags a b c) = memSize3 a b c initialPackageTags :: PackageTags initialPackageTags = emptyPackageTags @@ -202,12 +202,6 @@ getPackageTags = ask replacePackageTags :: PackageTags -> Update PackageTags () replacePackageTags = put -getReviewTags :: Query ReviewTags ReviewTags -getReviewTags = ask - -replaceReviewTags :: ReviewTags -> Update ReviewTags () -replaceReviewTags = put - getTagAliasesState :: Query TagAlias TagAlias getTagAliasesState = ask @@ -221,9 +215,6 @@ setPackageTags name tagList = modify $ setTags name tagList setTagPackages :: Tag -> Set PackageName -> Update PackageTags () setTagPackages tag pkgList = modify $ setTag tag pkgList --- setReviewPackageTags :: PackageName -> (Set Tag, Set Tag) -> Update PackageTags () --- setReviewPackageTags name (tagList1, taglist2) = modify $ setTags name reviewTags - -- | Tag a package. Returns True if the element was inserted, and False if -- the tag as already present (same result though) @@ -243,42 +234,28 @@ removePackageTag name tag = do Nothing -> return False Just pkgTags' -> put pkgTags' >> return True -clearReviewTags :: PackageName -> Update ReviewTags () -clearReviewTags pkgname - = do - ReviewTags m <- get - put (ReviewTags (Map.insert pkgname (Set.empty,Set.empty) m)) +clearReviewTags :: PackageName -> Update PackageTags () +clearReviewTags pkgname = do + PackageTags p t r <- get + put (PackageTags p t (Map.insert pkgname (Set.empty,Set.empty) r)) +insertReviewTags :: PackageName -> Set Tag -> Set Tag -> Update PackageTags () +insertReviewTags pkgname add del = do + PackageTags p t r <- get + put (PackageTags p t (Map.insertWith insertReviewHelper pkgname (add,del) r)) -insertReviewTags :: PackageName -> Set Tag -> Set Tag -> Update ReviewTags () -insertReviewTags pkgname add del - = do - ReviewTags m <- get - put (ReviewTags (Map.insertWith (insertReviewHelper) pkgname (add,del) m)) +insertReviewTags' :: PackageName -> Set Tag -> Set Tag -> Update PackageTags () +insertReviewTags' pkgname add del = do + PackageTags p t r <- get + put (PackageTags p t (Map.insert pkgname (add,del) r)) -insertReviewTags_ :: PackageName -> Set Tag -> Set Tag -> Update ReviewTags () -insertReviewTags_ pkgname add del - = do - ReviewTags m <- get - put (ReviewTags (Map.insert pkgname (add,del) m)) insertReviewHelper :: (Set Tag, Set Tag) -> (Set Tag, Set Tag) -> (Set Tag, Set Tag) insertReviewHelper (a,b) (c,d) = (Set.union a c, Set.union b d) -lookupReviewTags :: PackageName -> Query ReviewTags (Maybe (Set Tag, Set Tag)) -lookupReviewTags pkgname - = do ReviewTags m <- ask - return (Map.lookup pkgname m) - - +lookupReviewTags :: PackageName -> Query PackageTags (Set Tag, Set Tag) +lookupReviewTags pkgname = asks $ Map.findWithDefault (Set.empty, Set.empty) pkgname . reviewTags -$(makeAcidic ''ReviewTags ['insertReviewTags - ,'insertReviewTags_ - ,'lookupReviewTags - ,'getReviewTags - ,'clearReviewTags - ,'replaceReviewTags - ]) $(makeAcidic ''TagAlias ['addTagAlias ,'getTagAlias @@ -296,6 +273,10 @@ $(makeAcidic ''PackageTags ['tagsForPackage ,'setTagPackages ,'addPackageTag ,'removePackageTag + ,'insertReviewTags + ,'insertReviewTags' + ,'lookupReviewTags + ,'clearReviewTags ]) diff --git a/Distribution/Server/Features/Upload.hs b/Distribution/Server/Features/Upload.hs index ab9e38ec4..7b47f5f34 100644 --- a/Distribution/Server/Features/Upload.hs +++ b/Distribution/Server/Features/Upload.hs @@ -59,7 +59,8 @@ data UploadFeature = UploadFeature { maintainersGroup :: PackageName -> UserGroup, -- | Requiring being logged in as the maintainer of a package. - guardAuthorisedAsUploaderOrMaintainerOrTrustee :: PackageName -> ServerPartE String, + authorisedAsMaintainerOrTrustee :: PackageName -> ServerPartE Bool, + authorisedAsAnyUser :: ServerPartE Bool, guardAuthorisedAsMaintainer :: PackageName -> ServerPartE (), guardAuthorisedAsTrustee :: ServerPartE (), -- | Requiring being logged in as the maintainer of a package or a trustee. @@ -302,18 +303,15 @@ uploadFeature ServerEnv{serverBlobStore = store} guardAuthorisedAsTrustee :: ServerPartE () guardAuthorisedAsTrustee = - guardAuthorised_ [InGroup trusteesGroup] - - guardAuthorisedAsUploaderOrMaintainerOrTrustee :: PackageName -> ServerPartE String - guardAuthorisedAsUploaderOrMaintainerOrTrustee pkgname= do - mt <- guardAuthorised' [InGroup (maintainersGroup pkgname), InGroup trusteesGroup] - upl <- guardAuthorised' [AnyKnownUser] - if mt - then return "MaintainersOrTrustees" - else - if upl - then return "Uploaders" - else return "" + guardAuthorised_ [InGroup trusteesGroup] + + authorisedAsMaintainerOrTrustee :: PackageName -> ServerPartE Bool + authorisedAsMaintainerOrTrustee pkgname= + guardAuthorised' [InGroup (maintainersGroup pkgname), InGroup trusteesGroup] + + authorisedAsAnyUser :: ServerPartE Bool + authorisedAsAnyUser = + guardAuthorised' [AnyKnownUser] guardAuthorisedAsMaintainerOrTrustee :: PackageName -> ServerPartE () guardAuthorisedAsMaintainerOrTrustee pkgname = diff --git a/Distribution/Server/Features/Users.hs b/Distribution/Server/Features/Users.hs index 90205a6da..badbb6d93 100644 --- a/Distribution/Server/Features/Users.hs +++ b/Distribution/Server/Features/Users.hs @@ -5,7 +5,6 @@ module Distribution.Server.Features.Users ( initUserFeature, UserFeature(..), UserResource(..), - -- guardAuthorised', GroupResource(..), ) where @@ -394,9 +393,8 @@ userFeature templates usersState adminsState guardAuthorised' privconds = do users <- queryGetUserDb uid <- guardAuthenticatedWithErrHook users - a <- Auth.checkPriviledged users uid privconds - return a - + valid <- Auth.checkPriviledged users uid privconds + return valid -- Simply check if the user is authenticated as some user, without any -- check that they have any particular priveledges. Only useful as a diff --git a/Distribution/Server/Features/Votes.hs b/Distribution/Server/Features/Votes.hs index 515ab4440..dcb2badd3 100644 --- a/Distribution/Server/Features/Votes.hs +++ b/Distribution/Server/Features/Votes.hs @@ -35,7 +35,7 @@ data VotesFeature = VotesFeature { votesFeatureInterface :: HackageFeature , didUserVote :: forall m. MonadIO m => PackageName -> UserId -> m Bool , pkgNumVotes :: forall m. MonadIO m => PackageName -> m Int - , votesUpdated :: Hook (PackageName, Int) () + , votesUpdated :: Hook (PackageName, Int) () , renderVotesHtml :: PackageName -> ServerPartE X.Html } diff --git a/datafiles/static/hackage.css b/datafiles/static/hackage.css index f0ae92792..8fff2d126 100644 --- a/datafiles/static/hackage.css +++ b/datafiles/static/hackage.css @@ -64,6 +64,8 @@ h5 { font-size: 100%; /* 13pt */ } select, input, button, textarea { font:99% sans-serif; + margin: 0.5em; + padding: 0.1em; } table { diff --git a/datafiles/templates/Html/tag-edit.html.st b/datafiles/templates/Html/tag-edit.html.st index 8367fc9d9..c7b9bc3b7 100644 --- a/datafiles/templates/Html/tag-edit.html.st +++ b/datafiles/templates/Html/tag-edit.html.st @@ -11,6 +11,9 @@ .reject{ color:red; } + .eadd, .edel{ + clear:both; + } #additions, #deletions{ list-style: none; margin: 0px; @@ -22,7 +25,7 @@ display: inline-block; border: 1px solid black; } - #additions li :hover, #deletions li :hover { + #additions :hover, #deletions :hover { background: white; } @@ -58,19 +61,22 @@ $endif$ $if(istrustee)$ -
      - Proposals -
      additions: -
        +
        + Proposals +
        additions: +
          +           +

          deletions: -
            -
            - $endif$ - +
              +
              - - $footer()$ - + $endif$ +
              + + + $footer()$ + + @@ -141,10 +165,19 @@ $endif$ + $if(hasrdeps)$ + + ReverseDependencies + $rdeps$ + + $endif$ + + $if(hasexecs)$ Executables $executables$ + $endif$ Downloads @@ -153,7 +186,16 @@ Votes - $votesSection$ + $score$ ($votes$ Votes) +
                +
              • λ
                • +
              • λ
                • +
              • λ
                • +
              • λ
                • +
              • λ
                • +
              + Clear Rating + Status @@ -201,4 +243,47 @@ $footer()$ + diff --git a/datafiles/templates/Html/tag-interface.html.st b/datafiles/templates/Html/tag-interface.html.st index 0ceacfddb..9cb787451 100644 --- a/datafiles/templates/Html/tag-interface.html.st +++ b/datafiles/templates/Html/tag-interface.html.st @@ -16,7 +16,7 @@ - + $tabledata$ @@ -33,7 +33,19 @@ \$(document).ready(function() { - \$('#table').DataTable(); + \$('#table').DataTable({ + "bJQueryUI": true, + "bAutoWidth": false, // Disable the auto width calculation + "aoColumns": [ + { "sWidth": "15%" }, + { "sWidth": "10%" }, + { "sWidth": "10%" }, + { "sWidth": "10%" }, + { "sWidth": "25%" }, + { "sWidth": "15%" }, + { "sWidth": "15%" } + ] + }); \$('input.global_filter').on( 'keyup click', function () { filterGlobal(); From 465f158702f8a32e546e43a18e908bb9206fa12a Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Thu, 14 Jul 2016 09:31:40 +0530 Subject: [PATCH 08/39] Miscalleneous Limit revdeps to keep track of latest 5 versions Represent all the dep stats as ReverseCount HTML views for Revdeps by PackageID Popularity Metric based on RevDeps/Votes/Downloads Tag pages with packages by popularity --- Distribution/Server/Features/Html.hs | 45 ++++++++------- .../Server/Features/Html/HtmlUtilities.hs | 2 +- Distribution/Server/Features/PackageList.hs | 27 +++++---- .../Server/Features/ReverseDependencies.hs | 18 +++--- .../Features/ReverseDependencies/State.hs | 55 ++++++++++--------- Distribution/Server/Framework/MemSize.hs | 12 ++-- datafiles/templates/Html/package-page.html.st | 2 +- .../templates/Html/tag-interface.html.st | 32 ++++++----- datafiles/templates/index.html.st | 2 +- 9 files changed, 105 insertions(+), 90 deletions(-) diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 90ddc54c4..4c58319bd 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -464,7 +464,7 @@ mkHtmlCore ServerEnv{serverBaseURI} , (resourceAt "/packages/names" ) { resourceGet = [("html", const $ readAsyncCache cacheNamesPage)] } - , (resourceAt "/packages/names/tags" ) { + , (resourceAt "/packages/browse" ) { resourceDesc = [(GET, "Show detailed package dependency information")] , resourceGet = [("html", serveTagIndex)] @@ -582,7 +582,9 @@ mkHtmlCore ServerEnv{serverBaseURI} tabledata = "" +++ rowList +++ "" template <- getTemplate templates "tag-interface.html" return $ toResponse $ template - [ "tabledata" $= tabledata ] + [ "heading" $= "All packages" + , "content" $= "A browsable index of all the packages" + , "tabledata" $= tabledata ] serveDistroMonitorPage :: DynamicPath -> ServerPartE Response serveDistroMonitorPage dpath = do @@ -1514,19 +1516,23 @@ mkHtmlTags HtmlUtilities{..} let tagd = "Packages tagged " ++ display tg pkgs = Set.toList pkgnames items <- liftIO $ makeItemList pkgs - let (mtag, histogram) = Map.updateLookupWithKey (\_ _ -> Nothing) tg $ tagHistogram items + let rowList = map (makeRow) items + (mtag, histogram) = Map.updateLookupWithKey (\_ _ -> Nothing) tg $ tagHistogram items -- make a 'related tags' section, so exclude this tag from the histogram count = fromMaybe 0 mtag - return $ toResponse $ Resource.XHtml $ hackagePage tagd $ - [ h2 << tagd - , case items of + template <- getTemplate templates "tag-interface.html" + return $ toResponse $ template + [ "heading" $= tagd + , "content" $= case items of [] -> toHtml "No packages have this tag." _ -> toHtml [ paragraph << [if count==1 then "1 package has" else show count ++ " packages have", " this tag."] , anchor ! [href $ tagname ++ "/alias/edit"] << "[Merge tag]" , paragraph ! [theclass "toc"] << [toHtml "Related tags: ", toHtml $ showHistogram histogram] - , ulist ! [theclass "packages"] << map renderItem items ] + ] + , "tabledata" $= rowList ] + where showHistogram hist = (++takeHtml) . intersperse (toHtml ", ") $ map histogramEntry $ take takeAmount sortHist @@ -1945,22 +1951,19 @@ mkHtmlReverse HtmlUtilities{..} serveReverse :: Bool -> DynamicPath -> ServerPartE Response serveReverse isRecent dpath = do - pkgn <- packageInPath dpath - pkgid <- lookupPackageName pkgn - let pkgname = packageName (head pkgid) - packageid = packageId (head pkgid) - rdisp <- case packageVersion (head pkgid) of + pkgid <- packageInPath dpath + let pkgname = pkgName pkgid + rdisp <- case packageVersion pkgid of Version [] [] -> revPackageName pkgname - _ -> withPackageVersion packageid $ \_ -> revPackageId packageid + _ -> withPackageVersion pkgid $ \_ -> revPackageId pkgid render <- (if isRecent then renderReverseRecent else renderReverseOld) pkgname rdisp return $ toResponse $ Resource.XHtml $ hackagePage (display pkgname ++ " - Reverse dependencies ") $ - reversePackageRender packageid (corePackageIdUri "") isRecent render + reversePackageRender pkgid (corePackageIdUri "") isRecent render serveReverseFlat :: DynamicPath -> ServerPartE Response serveReverseFlat dpath = do - pkgn <- packageInPath dpath - pkgid <- lookupPackageName pkgn - let pkgname = packageName (head pkgid) + pkg <- packageInPath dpath + let pkgname = pkgName pkg revCount <- revPackageStats pkgname pairs <- revPackageFlat pkgname return $ toResponse $ Resource.XHtml $ hackagePage (display pkgname ++ "Flattened reverse dependencies") $ @@ -1968,12 +1971,12 @@ mkHtmlReverse HtmlUtilities{..} serveReverseStats :: DynamicPath -> ServerPartE Response serveReverseStats dpath = do - pkgn <- packageInPath dpath - pkgid <- lookupPackageName pkgn - let pkgname = packageName (head pkgid) + pkg <- packageInPath dpath + let pkgname = pkgName pkg + pkgids <- lookupPackageName pkgname revCount <- revPackageStats pkgname return $ toResponse $ Resource.XHtml $ hackagePage (display pkgname ++ "Reverse dependency statistics") $ - reverseStatsRender pkgname (map packageVersion pkgid) (corePackageIdUri "") revCount + reverseStatsRender pkgname (map packageVersion pkgids) (corePackageIdUri "") revCount serveReverseList :: DynamicPath -> ServerPartE Response serveReverseList _ = do diff --git a/Distribution/Server/Features/Html/HtmlUtilities.hs b/Distribution/Server/Features/Html/HtmlUtilities.hs index 2833fb71c..fba72277c 100644 --- a/Distribution/Server/Features/Html/HtmlUtilities.hs +++ b/Distribution/Server/Features/Html/HtmlUtilities.hs @@ -40,8 +40,8 @@ htmlUtilities CoreFeature{coreResource} makeRow item = tr << [ td $ packageNameLink $ itemName item , td $ toHtml $ show $ itemDownloads item , td $ toHtml $ show $ itemVotes item - , td $ toHtml $ show $ itemRevDepsCount item , td $ toHtml $ itemDesc item + , td $ toHtml $ show $ itemRevDepsCount item , td $ " (" +++ renderTags (itemTags item) +++ ")" , td $ toHtml $ itemMaintainer item ] diff --git a/Distribution/Server/Features/PackageList.hs b/Distribution/Server/Features/PackageList.hs index 98a8c90c5..9c1c2bc29 100644 --- a/Distribution/Server/Features/PackageList.hs +++ b/Distribution/Server/Features/PackageList.hs @@ -75,19 +75,19 @@ data PackageItem = PackageItem { -- How many test suites (>=0) this package has. itemNumTests :: !Int, -- How many benchmarks (>=0) this package has. - itemNumBenchmarks :: !Int - -- Hotness: a more heuristic way to sort packages. presently non-existent. - --itemHotness :: Int + itemNumBenchmarks :: !Int, + -- Hotness: a more heuristic way to sort packages + -- Hotness = recent downloads + stars + 2 * no rev deps + itemHotness :: !Float } instance MemSize PackageItem where - memSize (PackageItem a b c d e f g h i j k l) = memSize12 a b c d e f g h i j k l + memSize (PackageItem a b c d e f g h i j k l m) = memSize13 a b c d e f g h i j k l m emptyPackageItem :: PackageName -> PackageItem emptyPackageItem pkg = PackageItem pkg Set.empty Nothing "" "" - 0 0 0 False 0 0 0 - + 0 0 0 False 0 0 0 0 initListFeature :: ServerEnv -> IO (CoreFeature @@ -222,7 +222,8 @@ listFeature CoreFeature{..} , itemDeprecated = deprs , itemDownloads = cmFind pkgname downs , itemVotes = votes - , itemRevDepsCount = directReverseCount revCount + , itemRevDepsCount = directCount revCount + , itemHotness = votes + fromIntegral (cmFind pkgname downs) + fromIntegral (directCount revCount)*2 } ------------------------------ @@ -262,11 +263,14 @@ updateTagItem tags item = item { itemTags = tags } + updateVoteItem :: Float -> PackageItem -> PackageItem updateVoteItem score item = item { - itemVotes = score + itemVotes = score, + itemHotness = score + fromIntegral (itemDownloads item) + fromIntegral (itemRevDepsCount item)*2 } + updateDeprecation :: Maybe [PackageName] -> PackageItem -> PackageItem updateDeprecation pkgs item = item { @@ -276,12 +280,13 @@ updateDeprecation pkgs item = updateReverseItem :: ReverseCount -> PackageItem -> PackageItem updateReverseItem revCount item = item { - itemRevDepsCount = directReverseCount revCount + itemRevDepsCount = directCount revCount, + itemHotness = fromIntegral (directCount revCount)*2 + (itemVotes item) + fromIntegral (itemDownloads item) } - updateDownload :: Int -> PackageItem -> PackageItem updateDownload count item = item { - itemDownloads = count + itemDownloads = count, + itemHotness = fromIntegral count + (itemVotes item) + fromIntegral (itemRevDepsCount item)*2 } diff --git a/Distribution/Server/Features/ReverseDependencies.hs b/Distribution/Server/Features/ReverseDependencies.hs index ac5540d8c..b4d0f7f69 100644 --- a/Distribution/Server/Features/ReverseDependencies.hs +++ b/Distribution/Server/Features/ReverseDependencies.hs @@ -231,8 +231,8 @@ reverseFeature CoreFeature{..} renderReverseWith :: MonadIO m => PackageName -> ReverseDisplay -> (Maybe VersionStatus -> Bool) -> m ReversePageRender renderReverseWith pkg rev filterFunc = do let rev' = map fst $ Map.toList rev - versionCount <- sequence $ map (\p -> queryState reverseState $ GetReverseCount p) (pkg:rev') - let counts = zip (pkg:rev') (map (fst . countUtil) versionCount) + revcount <- mapM revPackageStats (pkg:rev') + let counts = zip (pkg:rev') (map directCount revcount) toRender (i, i') (pkgname, (version, status)) = case filterFunc status of False -> (,) (i, i'+1) Nothing True -> (,) (i+1, i') $ Just $ ReverseRender { @@ -261,17 +261,17 @@ reverseFeature CoreFeature{..} revPackageFlat :: MonadIO m => PackageName -> m [(PackageName, Int)] revPackageFlat pkgname = do deps <- queryState reverseState $ GetDependenciesI pkgname - counts <- sequence $ map (\dep -> queryState reverseState $ GetReverseCount dep) $ Set.toList deps - return $ zip (Set.toList deps) (map (fst . countUtil) counts) + counts <- mapM revPackageStats $ Set.toList deps + return $ zip (Set.toList deps) (map totalCount counts) revPackageStats :: MonadIO m => PackageName -> m ReverseCount revPackageStats pkgname = do count <- queryState reverseState (GetReverseCount pkgname) - return $ toReverseCount count + return count revPackageSummary :: MonadIO m => PackageId -> m (Int, Int) revPackageSummary pkg = do - count <- queryState reverseState $ GetReverseCountId pkg + count <- queryState reverseState (GetReverseCountId pkg) return count -- -- This returns a list of (package name, direct dependencies, flat dependencies) @@ -285,6 +285,6 @@ reverseFeature CoreFeature{..} revSummary = do ReverseIndex index _ _ <- queryReverseIndex let pkgnames = packageNames index - counts <- sequence $ map (\pkg -> queryState reverseState $ GetReverseCount pkg) pkgnames - let counts' = map countUtil counts - return $ zip3 pkgnames (map fst counts') (map snd counts') + util pii = sortBy (\(_,d1,_) (_,d2,_) -> compare d1 d2) pii + counts <- mapM revPackageStats pkgnames + return $ util $ zip3 pkgnames (map directCount counts) (map totalCount counts) diff --git a/Distribution/Server/Features/ReverseDependencies/State.hs b/Distribution/Server/Features/ReverseDependencies/State.hs index 16ddc18fa..65d86d41d 100644 --- a/Distribution/Server/Features/ReverseDependencies/State.hs +++ b/Distribution/Server/Features/ReverseDependencies/State.hs @@ -21,7 +21,7 @@ import Data.SafeCopy hiding (Version) import Data.Typeable (Typeable) import Data.Map (Map) import qualified Data.Map as Map -import Data.Bimap (Bimap) +import Data.Bimap (Bimap, (!), (!>)) import qualified Data.Bimap as Bimap import Control.Applicative import Data.Set (Set) @@ -33,7 +33,7 @@ import Control.Monad.State (put, get) import Control.Monad.Reader (ask, asks) import Data.Graph (Graph, Vertex) import qualified Data.Graph as Gr -import Data.Array ((!), accum) +import qualified Data.Array as Arr ((!), accum) type NodeId = Int type RevDeps = Graph @@ -77,7 +77,7 @@ addPackage :: PackageId -> [PackageId] addPackage pkgid deps ri@(ReverseIndex pindex revs nodemap) = let index = PackageIndex.insert pkgid pindex npm = Bimap.tryInsert pkgid (Bimap.size nodemap) nodemap - rd = insEdges (map (\d -> (npm Bimap.! d, [npm Bimap.! pkgid])) deps) revs + rd = insEdges (map (\d -> (npm ! d, [npm ! pkgid])) deps) revs in ri { duplicatedIndex = index, reverseDependencies = rd, @@ -88,7 +88,7 @@ removePackage :: PackageId -> [PackageId] -> ReverseIndex -> ReverseIndex removePackage pkgid deps ri@(ReverseIndex pindex revs nodemap) = let index = PackageIndex.deletePackageId pkgid pindex - rd = delEdges (map (\d -> (nodemap Bimap.! d, [nodemap Bimap.! pkgid])) deps) revs + rd = delEdges (map (\d -> (nodemap ! d, [nodemap ! pkgid])) deps) revs in ri { duplicatedIndex = index, reverseDependencies = rd, @@ -100,8 +100,8 @@ changePackage :: PackageId -> [PackageId] -> [PackageId] changePackage pkgid deps deps' ri@(ReverseIndex pindex revs nodemap) = let index = PackageIndex.insert pkgid pindex npm = Bimap.tryInsert pkgid (Bimap.size nodemap) nodemap - rd = delEdges (map (\d -> (npm Bimap.! d, [npm Bimap.! pkgid])) deps) revs - rd' = insEdges (map (\d -> (npm Bimap.! d, [npm Bimap.! pkgid])) deps') rd + rd = delEdges (map (\d -> (npm ! d, [npm ! pkgid])) deps) revs + rd' = insEdges (map (\d -> (npm ! d, [npm ! pkgid])) deps') rd in ri { duplicatedIndex = index, reverseDependencies = rd', @@ -113,9 +113,9 @@ getAllVersions index = map packageVersion . PackageIndex.lookupPackageName index constructRevDeps :: PackageIndex PkgInfo -> Bimap PackageId NodeId -> RevDeps constructRevDeps index nodemap = - let allPackages = PackageIndex.allPackages index + let allPackages = concatMap (take 5) $ PackageIndex.allPackagesByName index packageIds = map packageId allPackages - edges = concatMap (\pkg -> map (\dep -> (nodemap Bimap.! dep, (nodemap Bimap.!) . packageId $ pkg)) (getAllDependencies pkg index) ) allPackages + edges = concatMap (\pkg -> map (\dep -> (nodemap ! dep, (nodemap !) . packageId $ pkg)) (getAllDependencies pkg index) ) allPackages in Gr.buildG (0, maxNodes) edges getAllDependencies :: Package pkg => PkgInfo -> PackageIndex pkg -> [PackageId] @@ -135,31 +135,34 @@ getAllDependencies pkg index = -------------------------------------------------------------------------------- -- Calculating ReverseDisplays data ReverseCount = ReverseCount { - directReverseCount :: Int, - flattenedReverseCount :: Int, - versionReverseCount :: Map Version Int + directCount :: Int, + totalCount :: Int, + versionCount :: Map Version Int } deriving (Show, Eq, Typeable, Ord) +instance MemSize ReverseCount where + memSize (ReverseCount a b c) = memSize3 a b c + type ReverseDisplay = Map PackageName (Version, Maybe VersionStatus) type VersionIndex = (PackageName -> (PreferredInfo, [Version])) perPackageReverse :: VersionIndex -> ReverseIndex -> PackageName -> ReverseDisplay perPackageReverse indexFunc (ReverseIndex index revs nodemap) pkg = - if any (/= 0) (map (outdeg revs . (nodemap Bimap.!)) packageids) + if any (/= 0) (map (outdeg revs . (nodemap !)) packageids) then constructReverseDisplay indexFunc packagemap else Map.empty where packageids = map packageId $ PackageIndex.lookupPackageName index pkg - packagemap = toPackageMap $ map (nodemap Bimap.!>) (concatMap (suc revs . (nodemap Bimap.!)) packageids) + packagemap = toPackageMap $ map (nodemap !>) (concatMap (suc revs . (nodemap !)) packageids) perVersionReverse :: VersionIndex -> ReverseIndex -> PackageId -> ReverseDisplay perVersionReverse indexFunc (ReverseIndex _ revs nodemap) pkg = - if (/= 0) (outdeg revs (nodemap Bimap.! pkg)) + if (/= 0) (outdeg revs (nodemap ! pkg)) then constructReverseDisplay indexFunc packagemap else Map.empty where - packagemap = toPackageMap $ map (nodemap Bimap.!>) $ (suc revs . (nodemap Bimap.!)) pkg + packagemap = toPackageMap $ map (nodemap !>) $ (suc revs . (nodemap !)) pkg constructReverseDisplay :: VersionIndex -> Map PackageName (Set Version) -> ReverseDisplay constructReverseDisplay indexFunc deps = @@ -175,18 +178,18 @@ getDisplayInfo preferred index pkgname = (,) ----------------------------Graph Utility---------- suc :: RevDeps -> Vertex -> [Vertex] -suc g v = g ! v +suc g v = g Arr.! v outdeg :: RevDeps -> Vertex -> Int outdeg r = length . suc r insEdges :: [(NodeId, [NodeId])] -> RevDeps -> RevDeps insEdges edges revdeps = - accum (union) revdeps edges + Arr.accum (union) revdeps edges delEdges :: [(NodeId, [NodeId])] -> RevDeps -> RevDeps delEdges edges revdeps = - accum (\\) revdeps edges + Arr.accum (\\) revdeps edges -------------------------------------- countUtil :: [(Version,Int,Int)] -> (Int,Int) @@ -210,6 +213,7 @@ instance (SafeCopy a, SafeCopy b, Ord a, Ord b) => SafeCopy (Bimap a b) where -- getCopy = contain $ fmap (Gr.buildG (0,maxNodes)) safeGet $(deriveSafeCopy 0 'base ''ReverseIndex) +$(deriveSafeCopy 0 'base ''ReverseCount) initialReverseIndex :: ReverseIndex initialReverseIndex = emptyReverseIndex @@ -239,28 +243,29 @@ getDependencies :: PackageName -> Query ReverseIndex (Set PackageName) getDependencies pkg = do ReverseIndex index revdeps nodemap <- ask let packageIds = map packageId $ PackageIndex.lookupPackageName index pkg - pkgname p = packageName . (nodemap Bimap.!>) $ p - return $ Set.fromList (map (pkgname) (concatMap (suc revdeps . (nodemap Bimap.!)) packageIds)) + pkgname p = packageName . (nodemap !>) $ p + return $ Set.fromList (map (pkgname) (concatMap (suc revdeps . (nodemap !)) packageIds)) getDependenciesI :: PackageName -> Query ReverseIndex (Set PackageName) getDependenciesI pkg = do ReverseIndex index revdeps nodemap <- ask let packageIds = map packageId $ PackageIndex.lookupPackageName index pkg - pkgname p = packageName . (nodemap Bimap.!>) $ p - reachables = Set.fromList (map (pkgname) (concatMap (\p -> Gr.reachable revdeps (nodemap Bimap.! p)) packageIds)) + pkgname p = packageName . (nodemap !>) $ p + reachables = Set.fromList (map (pkgname) (concatMap (\p -> Gr.reachable revdeps (nodemap ! p)) packageIds)) return $ Set.difference reachables (Set.singleton pkg) -getReverseCount :: PackageName -> Query ReverseIndex [(Version,Int,Int)] +getReverseCount :: PackageName -> Query ReverseIndex ReverseCount getReverseCount pkg = do ReverseIndex index revdeps nodemap <- ask let packageIds = map packageId $ PackageIndex.lookupPackageName index pkg - return $ map (\p -> (pkgVersion p, outdeg revdeps (nodemap Bimap.! p), length (Gr.reachable revdeps (nodemap Bimap.! p) ) - 1)) packageIds + vii = map (\p -> (pkgVersion p, outdeg revdeps (nodemap ! p), length (Gr.reachable revdeps (nodemap ! p) ) - 1)) packageIds + return $ toReverseCount vii getReverseCountId :: PackageId -> Query ReverseIndex (Int,Int) getReverseCountId pkg = do ReverseIndex _ revdeps nodemap <- ask - return $ (outdeg revdeps (nodemap Bimap.! pkg), length (Gr.reachable revdeps (nodemap Bimap.! pkg)) - 1) + return $ (outdeg revdeps (nodemap ! pkg), length (Gr.reachable revdeps (nodemap ! pkg)) - 1) $(makeAcidic ''ReverseIndex ['getReverseIndex diff --git a/Distribution/Server/Framework/MemSize.hs b/Distribution/Server/Framework/MemSize.hs index c22bf5977..335c00f3e 100644 --- a/Distribution/Server/Framework/MemSize.hs +++ b/Distribution/Server/Framework/MemSize.hs @@ -3,7 +3,7 @@ module Distribution.Server.Framework.MemSize ( MemSize(..), memSizeMb, memSizeKb, memSize0, memSize1, memSize2, memSize3, memSize4, memSize5, - memSize6, memSize7, memSize8, memSize9, memSize10, memSize11, memSize12, + memSize6, memSize7, memSize8, memSize9, memSize10, memSize11, memSize13, memSizeUArray, memSizeUVector ) where @@ -65,7 +65,7 @@ memSize8 :: (MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize memSize9 :: (MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> Int memSize10 :: (MemSize a9, MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> a9 -> Int memSize11 :: (MemSize a10, MemSize a9, MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> a9 -> a10 -> Int -memSize12 :: (MemSize a11, MemSize a10, MemSize a9, MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> a9 -> a10 ->a11 -> Int +memSize13 :: (MemSize a12, MemSize a11, MemSize a10, MemSize a9, MemSize a8, MemSize a7, MemSize a6, MemSize a5, MemSize a4, MemSize a3, MemSize a2, MemSize a1, MemSize a) => a -> a1 -> a2 -> a3 -> a4 -> a5 -> a6 -> a7 -> a8 -> a9 -> a10 -> a11 -> a12 ->Int memSize0 = 0 memSize1 a = 2 + memSize a memSize2 a b = 3 + memSize a + memSize b @@ -100,16 +100,14 @@ memSize11 a b c d e + memSize g + memSize h + memSize i + memSize j + memSize k -memSize12 a b c d e f - g h i j k l= 13 + memSize a + memSize b + memSize c +memSize13 a b c d e f g + h i j k l m= 14 + memSize a + memSize b + memSize c + memSize d + memSize e + memSize f + memSize g + memSize h + memSize i + memSize j + memSize k + memSize l + + memSize m -instance MemSize () where - memSize _ = 0 - instance MemSize (a -> b) where memSize _ = 0 diff --git a/datafiles/templates/Html/package-page.html.st b/datafiles/templates/Html/package-page.html.st index 8d5374a98..fa83de6d3 100644 --- a/datafiles/templates/Html/package-page.html.st +++ b/datafiles/templates/Html/package-page.html.st @@ -186,7 +186,7 @@ - r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"
              NameDownloadsVotesDescriptionTagsMaintainer
              NameDLsRatingRevDepsDescriptionTagsMaintainer
              Votes$score$ ($votes$ Votes) + $score$ ($votes$ votes)
              • λ
              • λ
                • diff --git a/datafiles/templates/Html/tag-interface.html.st b/datafiles/templates/Html/tag-interface.html.st index 9cb787451..4c97b0322 100644 --- a/datafiles/templates/Html/tag-interface.html.st +++ b/datafiles/templates/Html/tag-interface.html.st @@ -12,11 +12,21 @@ $hackagePageHeader()$
                -

                All packages by name

                +

                $heading$

                + + $content$ - + + + + + + + + + $tabledata$ @@ -31,19 +41,13 @@ ).draw(); } - \$(document).ready(function() { - \$('#table').DataTable({ - "bJQueryUI": true, - "bAutoWidth": false, // Disable the auto width calculation - "aoColumns": [ - { "sWidth": "15%" }, - { "sWidth": "10%" }, - { "sWidth": "10%" }, - { "sWidth": "10%" }, - { "sWidth": "25%" }, - { "sWidth": "15%" }, - { "sWidth": "15%" } + \$('#table').removeAttr('width').DataTable({ + autoWidth: false, + columnDefs: [ + { width: '200px', targets: 0 }, + { width: '200px', targets: 1 }, + { width: '200px', targets: 2 } ] }); diff --git a/datafiles/templates/index.html.st b/datafiles/templates/index.html.st index 4f69f5f86..aa2d75606 100644 --- a/datafiles/templates/index.html.st +++ b/datafiles/templates/index.html.st @@ -44,9 +44,9 @@ search of package descriptions:

                There are a few other package indices:

                  +
                • Browsable package index
                • All tags
                • All packages by name, with tags
                  • -
                • A queryable tag index
                • All packages with reverse dependencies
                • All packages by download (since old download data isn't imported, this will look somewhat barren)
                • All packages with preferred versions
                  • From 7c65c7111175c2294ee3b95881f931cbcef2859a Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Sat, 16 Jul 2016 19:39:07 +0530 Subject: [PATCH 09/39] Maintainers link Add maintainers link to dataTables interface --- Distribution/Server/Features.hs | 1 + Distribution/Server/Features/Html.hs | 2 +- .../Server/Features/Html/HtmlUtilities.hs | 7 ++++--- Distribution/Server/Features/PackageList.hs | 20 +++++++++++++------ .../templates/Html/tag-interface.html.st | 9 +++------ 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Distribution/Server/Features.hs b/Distribution/Server/Features.hs index 92d667114..5ad692a7b 100644 --- a/Distribution/Server/Features.hs +++ b/Distribution/Server/Features.hs @@ -259,6 +259,7 @@ initHackageFeatures env@ServerEnv{serverVerbosity = verbosity} = do votesFeature tagsFeature versionsFeature + usersFeature searchFeature <- mkSearchFeature coreFeature diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 4c58319bd..f66fc7a91 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -163,7 +163,7 @@ initHtmlFeature env@ServerEnv{serverTemplatesDir, serverTemplatesMode, tarIndexCache reportsCore usersdetails - (htmlUtilities core tags) + (htmlUtilities core tags user) (reverseHtmlUtil reversef) mainCache namesCache templates diff --git a/Distribution/Server/Features/Html/HtmlUtilities.hs b/Distribution/Server/Features/Html/HtmlUtilities.hs index fba72277c..c4ffb93fb 100644 --- a/Distribution/Server/Features/Html/HtmlUtilities.hs +++ b/Distribution/Server/Features/Html/HtmlUtilities.hs @@ -15,6 +15,7 @@ import Data.Maybe (fromMaybe) import Distribution.Server.Features.PackageList import Distribution.Server.Pages.Util (packageType) import Distribution.Package +import Distribution.Server.Features.Users data HtmlUtilities = HtmlUtilities { packageLink :: PackageId -> Html @@ -26,9 +27,9 @@ data HtmlUtilities = HtmlUtilities { , renderDeps :: PackageName -> [PackageName] -> Html } -htmlUtilities :: CoreFeature -> TagsFeature -> HtmlUtilities +htmlUtilities :: CoreFeature -> TagsFeature -> UserFeature -> HtmlUtilities htmlUtilities CoreFeature{coreResource} - TagsFeature{tagsResource} = HtmlUtilities{..} + TagsFeature{tagsResource} UserFeature{userResource} = HtmlUtilities{..} where packageLink :: PackageId -> Html packageLink pkgid = anchor ! [href $ corePackageIdUri cores "" pkgid] << display pkgid @@ -43,7 +44,7 @@ htmlUtilities CoreFeature{coreResource} , td $ toHtml $ itemDesc item , td $ toHtml $ show $ itemRevDepsCount item , td $ " (" +++ renderTags (itemTags item) +++ ")" - , td $ toHtml $ itemMaintainer item + , td $ anchor ! [href $ userPageUri userResource "" (itemMaintainer item)] << display (itemMaintainer item) ] diff --git a/Distribution/Server/Features/PackageList.hs b/Distribution/Server/Features/PackageList.hs index 9c1c2bc29..179e59fa3 100644 --- a/Distribution/Server/Features/PackageList.hs +++ b/Distribution/Server/Features/PackageList.hs @@ -13,11 +13,14 @@ import Distribution.Server.Features.ReverseDependencies import Distribution.Server.Features.Votes import Distribution.Server.Features.DownloadCount import Distribution.Server.Features.Tags +import Distribution.Server.Features.Users +import Distribution.Server.Users.Users import Distribution.Server.Features.PreferredVersions import qualified Distribution.Server.Packages.PackageIndex as PackageIndex import Distribution.Server.Util.CountingMap (cmFind) import Distribution.Server.Packages.Types +import Distribution.Server.Users.Types import Distribution.Server.Features.ReverseDependencies import Distribution.Package @@ -57,7 +60,7 @@ data PackageItem = PackageItem { -- The description of the package from its Cabal file itemDesc :: !String, -- Maintainer of the package - itemMaintainer :: !String, + itemMaintainer :: UserName, -- Whether the item is in the Haskell Platform -- itemPlatform :: Bool, -- Number of votes for the package @@ -86,7 +89,7 @@ instance MemSize PackageItem where emptyPackageItem :: PackageName -> PackageItem -emptyPackageItem pkg = PackageItem pkg Set.empty Nothing "" "" +emptyPackageItem pkg = PackageItem pkg Set.empty Nothing "" (UserName "") 0 0 0 False 0 0 0 0 initListFeature :: ServerEnv @@ -96,6 +99,7 @@ initListFeature :: ServerEnv -> VotesFeature -> TagsFeature -> VersionsFeature + -> UserFeature -> IO ListFeature) initListFeature _env = do itemCache <- newMemStateWHNF Map.empty @@ -106,10 +110,11 @@ initListFeature _env = do download votesf@VotesFeature{..} tagsf@TagsFeature{..} - versions@VersionsFeature{..} -> do + versions@VersionsFeature{..} + users@UserFeature{..} -> do let (feature, modifyItem, updateDesc) = - listFeature core revs download votesf tagsf versions + listFeature core revs download votesf tagsf versions users itemCache itemUpdate registerHookJust packageChangeHook isPackageChangeAny $ \(pkgid, _) -> @@ -147,6 +152,7 @@ listFeature :: CoreFeature -> VotesFeature -> TagsFeature -> VersionsFeature + -> UserFeature -> MemState (Map PackageName PackageItem) -> Hook (Set PackageName) () -> (ListFeature, @@ -154,7 +160,7 @@ listFeature :: CoreFeature PackageName -> IO ()) listFeature CoreFeature{..} - ReverseFeature{..} DownloadFeature{..} VotesFeature{..} TagsFeature{..} VersionsFeature{..} + ReverseFeature{..} DownloadFeature{..} VotesFeature{..} TagsFeature{..} VersionsFeature{..} UserFeature{..} itemCache itemUpdate = (ListFeature{..}, modifyItem, updateDesc) where @@ -212,6 +218,7 @@ listFeature CoreFeature{..} constructItem :: PkgInfo -> IO (PackageName, PackageItem) constructItem pkg = do let pkgname = packageName pkg + users <- queryGetUserDb revCount <- revPackageStats pkgname tags <- queryTagsForPackage pkgname downs <- recentPackageDownloads @@ -219,6 +226,7 @@ listFeature CoreFeature{..} deprs <- queryGetDeprecatedFor pkgname return $ (,) pkgname $ (updateDescriptionItem (pkgDesc pkg) $ emptyPackageItem pkgname) { itemTags = tags + , itemMaintainer = userIdToName users (pkgLatestUploadUser pkg) , itemDeprecated = deprs , itemDownloads = cmFind pkgname downs , itemVotes = votes @@ -251,7 +259,7 @@ updateDescriptionItem genDesc item = -- This checks if the library is buildable. However, since -- desc is flattened, we might miss some flags. Perhaps use the -- CondTree instead. - itemMaintainer = maintainer desc, + -- itemMaintainer = maintainer desc, itemHasLibrary = hasLibs desc, itemNumExecutables = length . filter (buildable . buildInfo) $ executables desc, itemNumTests = length . filter (buildable . testBuildInfo) $ testSuites desc, diff --git a/datafiles/templates/Html/tag-interface.html.st b/datafiles/templates/Html/tag-interface.html.st index 4c97b0322..8792baed9 100644 --- a/datafiles/templates/Html/tag-interface.html.st +++ b/datafiles/templates/Html/tag-interface.html.st @@ -43,12 +43,9 @@ \$(document).ready(function() { \$('#table').removeAttr('width').DataTable({ - autoWidth: false, - columnDefs: [ - { width: '200px', targets: 0 }, - { width: '200px', targets: 1 }, - { width: '200px', targets: 2 } - ] + "bProcessing": true, + "bDeferRender": true, + "autoWidth": false }); \$('input.global_filter').on( 'keyup click', function () { From 329ca61f884cba9d64170491ec17648bd959ed9f Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Tue, 19 Jul 2016 12:16:53 +0530 Subject: [PATCH 10/39] Minor Fixes Fixes category parsing error. "a,b," now parsed to ["a","b"] as opposed to ["a","b",""] Minor UI fixes Fixes tag-edit.html error (caused by rebase) --- .../Server/Features/Html/HtmlUtilities.hs | 2 +- Distribution/Server/Packages/Render.hs | 5 +- datafiles/templates/Html/package-page.html.st | 14 +- datafiles/templates/Html/tag-edit.html.st | 171 +++++++++--------- 4 files changed, 94 insertions(+), 98 deletions(-) diff --git a/Distribution/Server/Features/Html/HtmlUtilities.hs b/Distribution/Server/Features/Html/HtmlUtilities.hs index c4ffb93fb..de451f629 100644 --- a/Distribution/Server/Features/Html/HtmlUtilities.hs +++ b/Distribution/Server/Features/Html/HtmlUtilities.hs @@ -9,7 +9,7 @@ import qualified Data.Set as Set import Distribution.Server.Features.Tags import Distribution.Server.Features.Core import Distribution.Text (display) -import Data.List (intersperse, intercalate) +import Data.List (intersperse) import Data.Set (Set) import Data.Maybe (fromMaybe) import Distribution.Server.Features.PackageList diff --git a/Distribution/Server/Packages/Render.hs b/Distribution/Server/Packages/Render.hs index 73d1b95e6..691f09ca5 100644 --- a/Distribution/Server/Packages/Render.hs +++ b/Distribution/Server/Packages/Render.hs @@ -120,7 +120,7 @@ doPackageRender users info = PackageRender isBuildable ctData = if buildable $ getBuildInfo ctData then Buildable else NotBuildable - + moduleHasDocs :: Maybe TarIndex -> ModuleName -> Bool moduleHasDocs Nothing = const False moduleHasDocs (Just doctar) = isJust . TarIndex.lookup doctar @@ -149,8 +149,9 @@ data IsBuildable = Buildable categorySplit :: String -> [String] categorySplit xs | all isSpace xs = [] -categorySplit xs = map (dropWhile isSpace) $ splitOn ',' xs +categorySplit xs = if last res == "" then init res else res where + res = map (dropWhile isSpace) $ splitOn ',' xs splitOn x ys = front : case back of [] -> [] (_:ys') -> splitOn x ys' diff --git a/datafiles/templates/Html/package-page.html.st b/datafiles/templates/Html/package-page.html.st index fa83de6d3..a55d467d2 100644 --- a/datafiles/templates/Html/package-page.html.st +++ b/datafiles/templates/Html/package-page.html.st @@ -24,11 +24,6 @@ float: left; margin: 0 1% 0 1%; } - .clear-rating { - float: left; - clear: both; - margin-bottom:1%; - } @@ -42,7 +37,7 @@

                  The $package.name$ package

                  - [Tags:$tags$] + [Tags: $tags$] [ Propose Tags ]
                  @@ -187,14 +182,15 @@
                diff --git a/datafiles/templates/Html/tag-edit.html.st b/datafiles/templates/Html/tag-edit.html.st index c7b9bc3b7..c211d81b8 100644 --- a/datafiles/templates/Html/tag-edit.html.st +++ b/datafiles/templates/Html/tag-edit.html.st @@ -1,10 +1,10 @@ - $hackageCssTheme()$ - Edit package tags | Hackage - - @@ -37,8 +19,8 @@

                The $package.name$ package

                - [Tags: $tags$] - [ Propose Tags ] + [ Tags: $tags$ ] + [ Propose Tags ]
                $if(isDeprecated)$ @@ -165,6 +147,14 @@ + $endif$ $if(hasexecs)$ @@ -185,9 +175,9 @@ $if(myrating)$
                [my rating : $myrating$] - [Clear Rating]
                $endif$ + [Clear Rating]
                • λ
                • λ
                  • @@ -236,52 +226,8 @@ $endif$ - - + + $packagePageAssets()$ $footer()$ - - diff --git a/datafiles/templates/Html/tag-interface.html.st b/datafiles/templates/Html/tag-interface.html.st index 8792baed9..3f9b2dfac 100644 --- a/datafiles/templates/Html/tag-interface.html.st +++ b/datafiles/templates/Html/tag-interface.html.st @@ -16,16 +16,16 @@ $content$ -
                NameDLsRatingRevDepsDescriptionTagsMaintainer
                Name
                DLs
                Rating
                Description
                RDeps
                Tags
                Maintainer
                Votes $score$ ($votes$ votes) + my rating : $myrating$
                • λ
                • λ
                • λ
                  • -
                • λ
                  • -
                • λ
                - Clear Rating +
                + [Clear Rating] +
                ReverseDependencies $rdeps$
                +
                - - - - - + + + + + diff --git a/datafiles/templates/hackagePageHeader.st b/datafiles/templates/hackagePageHeader.st index 3ee6795d8..9d36fce0b 100644 --- a/datafiles/templates/hackagePageHeader.st +++ b/datafiles/templates/hackagePageHeader.st @@ -11,7 +11,7 @@ -
              • Browse
                • +
              • Browse
              • What's new
                • diff --git a/datafiles/templates/packagePageAssets.st b/datafiles/templates/packagePageAssets.st new file mode 100644 index 000000000..c12a9a85a --- /dev/null +++ b/datafiles/templates/packagePageAssets.st @@ -0,0 +1,171 @@ + + + + + From 078dd7181c925fed89bd48f3adc243eec7d0063a Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Wed, 3 Aug 2016 22:20:26 +0530 Subject: [PATCH 14/39] HLinted --- Distribution/Server/Features/Html.hs | 48 +++++++++---------- .../Server/Features/Html/HtmlUtilities.hs | 22 ++++----- Distribution/Server/Features/PackageList.hs | 23 +++++---- .../Server/Features/ReverseDependencies.hs | 43 +++++++---------- .../Features/ReverseDependencies/State.hs | 34 +++++++------ Distribution/Server/Features/Tags.hs | 26 +++++----- Distribution/Server/Features/Tags/State.hs | 24 ++++------ Distribution/Server/Features/Votes.hs | 7 ++- Distribution/Server/Pages/Reverse.hs | 19 ++++---- 9 files changed, 115 insertions(+), 131 deletions(-) diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 68347932a..236053c73 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -525,19 +525,19 @@ mkHtmlCore ServerEnv{serverBaseURI} return $ toResponse . template $ -- IO-related items - [ "baseurl" $= show (serverBaseURI) + [ "baseurl" $= show serverBaseURI , "cabalVersion" $= display cabalVersion - , "tags" $= (renderTags tags) - , "versions" $= (PagesNew.renderVersion realpkg - (classifyVersions prefInfo $ map packageVersion pkgs) infoUrl) + , "tags" $= renderTags tags + , "versions" $= PagesNew.renderVersion realpkg + (classifyVersions prefInfo $ map packageVersion pkgs) infoUrl , "totalDownloads" $= totalDown - , "hasexecs" $= (if (null execs) then False else True) + , "hasexecs" $= not (null execs) , "recentDownloads" $= recentDown , "votes" $= pkgVotes , "score" $= pkgScore - , "hasrdeps" $= (if (rdeps == ([],[])) then False else True) - , "rdeps" $= renderPkgPageDeps pkgname rdeps - , "rdepsummary" $= renderDeps pkgname rdeps + , "hasrdeps" $= not (rdeps == ([],[])) + , "rdeps" $= renderPkgPageDeps rdeps + , "rdepsummary" $= renderDeps pkgname rdeps , "buildStatus" $= buildStatus ] ++ -- Items not related to IO (mostly pure functions) @@ -579,7 +579,7 @@ mkHtmlCore ServerEnv{serverBaseURI} pkgIndex <- queryGetPackageIndex let packageNames = Pages.toPackageNames pkgIndex pkgDetails <- liftIO $ makeItemList packageNames - let rowList = map (makeRow) pkgDetails + let rowList = map makeRow pkgDetails tabledata = "" +++ rowList +++ "" template <- getTemplate templates "tag-interface.html" return $ toResponse $ template @@ -1405,7 +1405,7 @@ mkHtmlDownloads HtmlUtilities{..} DownloadFeature{..} = HtmlDownloads{..} [ tr << [ th << "Package name", th << "Downloads" ] ] ++ [ tr ! [theclass (if odd n then "odd" else "even")] << [ td << packageNameLink pkgname - , td << [ toHtml $ (show count) ] ] + , td << [ toHtml (show count) ] ] | ((pkgname, count), n) <- zip pkgList [(1::Int)..] ] sortedPackages :: RecentDownloads -> [(PackageName, Int)] @@ -1471,12 +1471,12 @@ mkHtmlTags HtmlUtilities{..} tagList <- queryGetTagList let withCounts = filter ((>0) . snd) . map (\(tg, pkgs) -> (tg, Set.size pkgs)) $ tagList countSort = sortBy (flip compare `on` snd) withCounts - return $ toResponse $ Resource.XHtml $ hackagePage "Hackage tags" $ + return $ toResponse $ Resource.XHtml $ hackagePage "Hackage tags" [ h2 << "Hackage tags" , h4 << "By name" - , paragraph ! [theclass "toc"] << (intersperse (toHtml ", ") $ map (tagItem . fst) withCounts) + , paragraph ! [theclass "toc"] << intersperse (toHtml ", ") (map (tagItem . fst) withCounts) , h4 << "By frequency" - , paragraph ! [theclass "toc"] << (intersperse (toHtml ", ") $ map (toHtml . tagCountItem) countSort) + , paragraph ! [theclass "toc"] << intersperse (toHtml ", ") (map (toHtml . tagCountItem) countSort) ] where tagCountItem (tg, count) = [ tagItem tg @@ -1486,12 +1486,12 @@ mkHtmlTags HtmlUtilities{..} putAliasEdit :: DynamicPath -> ServerPartE Response putAliasEdit dpath = do - let tagname = snd (dpath !! 0) + tagname <- tagInPath dpath mergeTags (Tag tagname) - return $ toResponse $ Resource.XHtml $ hackagePage "Merged Tag" $ + return $ toResponse $ Resource.XHtml $ hackagePage "Merged Tag" [ h2 << "Merged tag" , toHtml "Return to " - , anchor ! [href $ "/packages/tags"] << "tag listings" + , anchor ! [href "/packages/tags"] << "tag listings" ] serveAliasForm :: DynamicPath -> ServerPartE Response @@ -1508,7 +1508,7 @@ mkHtmlTags HtmlUtilities{..} ] ] ] - return $ toResponse $ Resource.XHtml $ hackagePage ("Merge Tag " ++ tagname) $ aliasForm + return $ toResponse $ Resource.XHtml $ hackagePage ("Merge Tag " ++ tagname) aliasForm serveTagListing :: DynamicPath -> ServerPartE Response serveTagListing dpath = do @@ -1517,7 +1517,7 @@ mkHtmlTags HtmlUtilities{..} let tagd = "Packages tagged " ++ display tg pkgs = Set.toList pkgnames items <- liftIO $ makeItemList pkgs - let rowList = map (makeRow) items + let rowList = map makeRow items (mtag, histogram) = Map.updateLookupWithKey (\_ _ -> Nothing) tg $ tagHistogram items -- make a 'related tags' section, so exclude this tag from the histogram count = fromMaybe 0 mtag @@ -1568,7 +1568,7 @@ mkHtmlTags HtmlUtilities{..} currTags <- queryTagsForPackage pkgname revTags <- queryReviewTagsForPackage pkgname template <- getTemplate templates "tag-edit.html" - let toStr = concat . intersperse ", " . map display . Set.toList + let toStr = intercalate ", " . map display . Set.toList tagsStr = toStr currTags addns = toStr $ fst revTags delns = toStr $ snd revTags @@ -1581,9 +1581,9 @@ mkHtmlTags HtmlUtilities{..} , "tags" $= tagsStr , "delns" $= delns , "istrustee" $= trustainer - , "isuser" $= if trustainer then False else True + , "isuser" $= not trustainer ] - else return $ toResponse $ Resource.XHtml $ hackagePage "Error" $ [h2 << "Authorization Error" + else return $ toResponse $ Resource.XHtml $ hackagePage "Error" [h2 << "Authorization Error" , paragraph << "You need to be logged in to propose tags"] @@ -1694,7 +1694,7 @@ mkHtmlSearch HtmlUtilities{..} ptype = packageType (itemHasLibrary item) (itemNumExecutables item) (itemNumTests item) (itemNumBenchmarks item) classes = case classList of [] -> []; _ -> [theclass $ unwords classList] - classList = (case itemDeprecated item of Nothing -> []; _ -> ["deprecated"]) + classList = case itemDeprecated item of Nothing -> []; _ -> ["deprecated"] range = (offset, offset + length pkgDetails) moreResultsLink = @@ -1821,8 +1821,8 @@ mkHtmlSearch HtmlUtilities{..} resetParamsForm termsStr = let SearchRankParameters{..} = defaultSearchRankParameters in form ! [XHtml.method "GET", action "/packages/search"] << - (concat $ - [ input ! [ thetype "submit", value "Reset parameters" ] + concat + ([ input ! [ thetype "submit", value "Reset parameters" ] , input ! [ thetype "hidden", name "terms", value termsStr ] , input ! [ thetype "hidden", name "explain" ] , input ! [ thetype "hidden", name "k1", value (show paramK1) ] ] diff --git a/Distribution/Server/Features/Html/HtmlUtilities.hs b/Distribution/Server/Features/Html/HtmlUtilities.hs index a708be4cd..3f0bc41f3 100644 --- a/Distribution/Server/Features/Html/HtmlUtilities.hs +++ b/Distribution/Server/Features/Html/HtmlUtilities.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE RecursiveDo, FlexibleContexts, RankNTypes, NamedFieldPuns, RecordWildCards #-} +{-# LANGUAGE FlexibleContexts, RankNTypes, NamedFieldPuns, RecordWildCards #-} module Distribution.Server.Features.Html.HtmlUtilities ( HtmlUtilities(..), htmlUtilities @@ -9,7 +9,7 @@ import qualified Data.Set as Set import Distribution.Server.Features.Tags import Distribution.Server.Features.Core import Distribution.Text (display) -import Data.List (intersperse) +import Data.List (intersperse, intercalate) import Data.Set (Set) import Distribution.Server.Features.PackageList import Distribution.Server.Pages.Util (packageType) @@ -24,7 +24,7 @@ data HtmlUtilities = HtmlUtilities { , renderTags :: Set Tag -> [Html] , renderReviewTags :: Set Tag -> (Set Tag, Set Tag) -> PackageName -> [Html] , renderDeps :: PackageName -> ([PackageName], [PackageName]) -> Html - , renderPkgPageDeps :: PackageName -> ([PackageName], [PackageName]) -> Html + , renderPkgPageDeps :: ([PackageName], [PackageName]) -> Html } htmlUtilities :: CoreFeature -> TagsFeature -> UserFeature -> HtmlUtilities @@ -44,7 +44,7 @@ htmlUtilities CoreFeature{coreResource} , td $ toHtml $ itemDesc item , td $ toHtml $ show $ itemRevDepsCount item , td $ " (" +++ renderTags (itemTags item) +++ ")" - , td $ "" +++ (intersperse (toHtml ", ") (map renderUser (itemMaintainer item))) + , td $ "" +++ intersperse (toHtml ", ") (map renderUser (itemMaintainer item)) ] where renderUser user = anchor ! [href $ userPageUri userResource "" user] << display user @@ -60,7 +60,7 @@ htmlUtilities CoreFeature{coreResource} ptype = packageType (itemHasLibrary item) (itemNumExecutables item) (itemNumTests item) (itemNumBenchmarks item) classes = case classList of [] -> []; _ -> [theclass $ unwords classList] - classList = (case itemDeprecated item of Nothing -> []; _ -> ["deprecated"]) + classList = case itemDeprecated item of Nothing -> []; _ -> ["deprecated"] renderTags :: Set Tag -> [Html] renderTags tags = intersperse (toHtml ", ") @@ -70,7 +70,7 @@ htmlUtilities CoreFeature{coreResource} -- The page displayed at /package/:package/tags renderReviewTags :: Set Tag -> (Set Tag, Set Tag) -> PackageName -> [Html] renderReviewTags currTags revTags pkgname= - let toStr = concat . intersperse ", " . map display . Set.toList + let toStr = intercalate ", " . map display . Set.toList tagsStr = toStr currTags addns = toStr $ fst revTags delns = toStr $ snd revTags @@ -81,12 +81,12 @@ htmlUtilities CoreFeature{coreResource} in [ big $ bold $ toHtml $ display pkgname , disp - , anchor ![href $ "tags/edit" ] << "Propose a tag?", toHtml " or " + , anchor ![href "tags/edit" ] << "Propose a tag?", toHtml " or " , toHtml "return to ", packageNameLink pkgname, br ] - renderPkgPageDeps :: PackageName -> ([PackageName], [PackageName])-> Html - renderPkgPageDeps pkg (direct, indirect) = + renderPkgPageDeps :: ([PackageName], [PackageName])-> Html + renderPkgPageDeps (direct, indirect) = map toHtml [show (length direct), " direct", ", ", show (length indirect), " indirect "] +++ thespan ! [thestyle "font-size: small", theclass "revdepdetails"] << (" [" +++ anchor ! [href ""] << "details" +++ "]") @@ -98,10 +98,10 @@ htmlUtilities CoreFeature{coreResource} detailsLink where summary title_ dep = thediv << [ bold (toHtml title_), br - , p << (intersperse (toHtml ", ") $ map packageNameLink dep) + , p << intersperse (toHtml ", ") (map packageNameLink dep) ] detailsLink = thespan ! [thestyle "font-size: small"] << (" [" +++ anchor ! [href detailURL] << "details" +++ "]") - detailURL = "/package/" ++ (unPackageName pkg) ++ "/reverse" + detailURL = "/package/" ++ unPackageName pkg ++ "/reverse" cores = coreResource diff --git a/Distribution/Server/Features/PackageList.hs b/Distribution/Server/Features/PackageList.hs index 750ae94b9..6c0fef7b4 100644 --- a/Distribution/Server/Features/PackageList.hs +++ b/Distribution/Server/Features/PackageList.hs @@ -28,7 +28,7 @@ import Distribution.PackageDescription import Distribution.PackageDescription.Configuration import Control.Concurrent -import Data.Maybe (catMaybes) +import Data.Maybe (mapMaybe) import Data.Map (Map) import qualified Data.Map as Map import Data.Set (Set) @@ -186,14 +186,13 @@ listFeature CoreFeature{..} modifyItem pkgname token = do hasItem <- fmap (Map.member pkgname) $ readMemState itemCache - case hasItem of - True -> modifyMemState itemCache $ Map.adjust token pkgname - False -> do - index <- queryGetPackageIndex - let pkgs = PackageIndex.lookupPackageName index pkgname - case pkgs of - [] -> return () --this shouldn't happen - _ -> modifyMemState itemCache . uncurry Map.insert =<< constructItem (last pkgs) + if hasItem then modifyMemState itemCache $ Map.adjust token pkgname + else (do + index <- queryGetPackageIndex + let pkgs = PackageIndex.lookupPackageName index pkgname + case pkgs of + [] -> return () --this shouldn't happen + _ -> modifyMemState itemCache . uncurry Map.insert =<< constructItem (last pkgs)) updateDesc pkgname = do index <- queryGetPackageIndex let pkgs = PackageIndex.lookupPackageName index pkgname @@ -239,7 +238,7 @@ listFeature CoreFeature{..} makeItemList :: [PackageName] -> IO [PackageItem] makeItemList pkgnames = do mainMap <- readMemState itemCache - return $ catMaybes $ map (flip Map.lookup mainMap) pkgnames + return $ mapMaybe (`Map.lookup` mainMap) pkgnames makeItemMap :: Map PackageName a -> IO (Map PackageName (PackageItem, a)) makeItemMap pkgmap = do @@ -290,12 +289,12 @@ updateReverseItem :: ReverseCount -> PackageItem -> PackageItem updateReverseItem revCount item = item { itemRevDepsCount = directCount revCount, - itemHotness = fromIntegral (directCount revCount)*2 + (itemVotes item) + fromIntegral (itemDownloads item) + itemHotness = fromIntegral (directCount revCount)*2 + itemVotes item + fromIntegral (itemDownloads item) } updateDownload :: Int -> PackageItem -> PackageItem updateDownload count item = item { itemDownloads = count, - itemHotness = fromIntegral count + (itemVotes item) + fromIntegral (itemRevDepsCount item)*2 + itemHotness = fromIntegral count + itemVotes item + fromIntegral (itemRevDepsCount item)*2 } diff --git a/Distribution/Server/Features/ReverseDependencies.hs b/Distribution/Server/Features/ReverseDependencies.hs index 60640345e..344917f41 100644 --- a/Distribution/Server/Features/ReverseDependencies.hs +++ b/Distribution/Server/Features/ReverseDependencies.hs @@ -2,7 +2,6 @@ module Distribution.Server.Features.ReverseDependencies ( ReverseFeature(..), ReverseCount(..), - reverseResource, ReverseResource(..), reverseHook, initReverseFeature, @@ -18,8 +17,6 @@ import Distribution.Server.Features.PreferredVersions import Distribution.Server.Packages.PackageIndex (packageNames) import Distribution.Server.Features.ReverseDependencies.State - -import Distribution.Server.Features.PreferredVersions import qualified Distribution.Server.Framework.Cache as Cache import Distribution.Package @@ -116,7 +113,7 @@ reverseStateComponent stateDir = do , getState = query st GetReverseIndex , putState = update st . ReplaceReverseIndex -- Nothing for now - , backupState = \_ revDeps -> [] + , backupState = \_ _ -> [] , restoreState = RestoreBackup { restoreEntry = error "Unexpected backup entry" , restoreFinalize = return emptyReverseIndex @@ -175,16 +172,16 @@ reverseFeature CoreFeature{..} setReverse pkg deps = do modifyMemState calculatedRI (addPackage pkg deps) void $ updateState reverseState $ AddReversePackage pkg deps - runHook_ reverseHook ([pkg]) + runHook_ reverseHook [pkg] reverseResource = fix $ \r -> ReverseResource - { reversePackage = resourceAt ("/package/:package/reverse.:format") - , reversePackageOld = resourceAt ("/package/:package/reverse/old.:format") - , reversePackageAll = resourceAt ("/package/:package/reverse/all.:format") - , reversePackageStats = resourceAt ("/package/:package/reverse/summary.:format") - , reversePackages = resourceAt ("/packages/reverse.:format") - , reversePackagesAll = resourceAt ("/packages/reverse/all.:format") + { reversePackage = resourceAt "/package/:package/reverse.:format" + , reversePackageOld = resourceAt "/package/:package/reverse/old.:format" + , reversePackageAll = resourceAt "/package/:package/reverse/all.:format" + , reversePackageStats = resourceAt "/package/:package/reverse/summary.:format" + , reversePackages = resourceAt "/packages/reverse.:format" + , reversePackagesAll = resourceAt "/packages/reverse/all.:format" , reverseUri = \format pkg -> renderResource (reversePackage r) [display pkg, format] , reverseNameUri = \format pkg -> renderResource (reversePackage r) [display pkg, format] @@ -234,13 +231,11 @@ reverseFeature CoreFeature{..} let rev' = map fst $ Map.toList rev revcount <- mapM revPackageStats (pkg:rev') let counts = zip (pkg:rev') (map directCount revcount) - toRender (i, i') (pkgname, (version, status)) = case filterFunc status of - False -> (,) (i, i'+1) Nothing - True -> (,) (i+1, i') $ Just $ ReverseRender { - rendRevPkg = PackageIdentifier pkgname version, - rendRevStatus = status, - rendRevCount = fromJust $ lookup pkgname counts - } + toRender (i, i') (pkgname, (version, status)) = if filterFunc status then (,) (i+1, i') $ Just ReverseRender { + rendRevPkg = PackageIdentifier pkgname version, + rendRevStatus = status, + rendRevCount = fromJust $ lookup pkgname counts + } else (,) (i, i'+1) Nothing (res, rlist) = mapAccumL toRender (0, 0) (Map.toList rev) pkgCount = fromJust $ lookup pkg counts return $ ReversePageRender (catMaybes rlist) res pkgCount @@ -266,14 +261,12 @@ reverseFeature CoreFeature{..} return $ zip (Set.toList deps) (map totalCount counts) revPackageStats :: MonadIO m => PackageName -> m ReverseCount - revPackageStats pkgname = do - count <- queryState reverseState (GetReverseCount pkgname) - return count + revPackageStats pkgname = + queryState reverseState (GetReverseCount pkgname) revPackageSummary :: MonadIO m => PackageId -> m (Int, Int) - revPackageSummary pkg = do - count <- queryState reverseState (GetReverseCountId pkg) - return count + revPackageSummary pkg = + queryState reverseState (GetReverseCountId pkg) -- -- This returns a list of (package name, direct dependencies, flat dependencies) -- -- for all packages. An interesting fact: it even does so for packages which @@ -286,6 +279,6 @@ reverseFeature CoreFeature{..} revSummary = do ReverseIndex index _ _ <- queryReverseIndex let pkgnames = packageNames index - util pii = sortBy (\(_,d1,_) (_,d2,_) -> compare d1 d2) pii + util = sortBy (\(_,d1,_) (_,d2,_) -> compare d1 d2) counts <- mapM revPackageStats pkgnames return $ util $ zip3 pkgnames (map directCount counts) (map totalCount counts) diff --git a/Distribution/Server/Features/ReverseDependencies/State.hs b/Distribution/Server/Features/ReverseDependencies/State.hs index 033624e9f..4b820f8a8 100644 --- a/Distribution/Server/Features/ReverseDependencies/State.hs +++ b/Distribution/Server/Features/ReverseDependencies/State.hs @@ -15,8 +15,8 @@ import Distribution.PackageDescription import Distribution.Version import Data.Acid (Query, Update, makeAcidic) -import Data.List (foldl', union, (\\)) -import Data.Maybe (isJust, mapMaybe, maybeToList, fromMaybe) +import Data.List (union, (\\)) +import Data.Maybe (maybeToList) import Data.SafeCopy hiding (Version) import Data.Typeable (Typeable) import Data.Map (Map) @@ -27,10 +27,9 @@ import Control.Applicative import Data.Set (Set) import qualified Data.Set as Set import Control.Monad (void) -import Data.STRef import Control.Monad.ST import Control.Monad.State (put, get) -import Control.Monad.Reader (ask, asks) +import Control.Monad.Reader (ask) import Data.Graph (Graph, Vertex) import qualified Data.Graph as Gr import qualified Data.Array as Arr ((!), accum, bounds) @@ -108,7 +107,6 @@ getAllVersions index = map packageVersion . PackageIndex.lookupPackageName index constructRevDeps :: PackageIndex PkgInfo -> Bimap PackageId NodeId -> RevDeps constructRevDeps index nodemap = let allPackages = concatMap (take 5) $ PackageIndex.allPackagesByName index - packageIds = map packageId allPackages edges = concatMap (\pkg -> map (\dep -> (nodemap ! dep, (nodemap !) . packageId $ pkg)) (getAllDependencies pkg index) ) allPackages in Gr.buildG (0, Bimap.size nodemap) edges @@ -118,7 +116,7 @@ getAllDependencies pkg index = where desc = pkgDesc pkg toDepsList :: [CondTree v [Dependency] a] -> [PackageId] - toDepsList l = map (packageId) (concatMap ((PackageIndex.lookupDependency index)) $ concatMap harvestDependencies l) + toDepsList l = map packageId (concatMap (PackageIndex.lookupDependency index) $ concatMap harvestDependencies l) -- | Collect all dependencies from all branches of a condition tree. harvestDependencies :: CondTree v [Dependency] a -> [Dependency] harvestDependencies (CondNode _ deps comps) = deps ++ concatMap forComponent comps @@ -159,8 +157,8 @@ perVersionReverse indexFunc (ReverseIndex _ revs nodemap) pkg = packagemap = toPackageMap $ map (nodemap !>) $ (suc revs . (nodemap !)) pkg constructReverseDisplay :: VersionIndex -> Map PackageName (Set Version) -> ReverseDisplay -constructReverseDisplay indexFunc deps = - Map.mapMaybeWithKey (uncurry maybeBestVersion . indexFunc) deps +constructReverseDisplay indexFunc = + Map.mapMaybeWithKey (uncurry maybeBestVersion . indexFunc) getDisplayInfo :: PreferredVersions -> PackageIndex PkgInfo -> VersionIndex getDisplayInfo preferred index pkgname = (,) @@ -179,7 +177,7 @@ outdeg r = length . suc r insEdges :: [(NodeId, [NodeId])] -> RevDeps -> RevDeps insEdges edges revdeps = - Arr.accum (union) revdeps edges + Arr.accum union revdeps edges delEdges :: [(NodeId, [NodeId])] -> RevDeps -> RevDeps delEdges edges revdeps = @@ -190,16 +188,16 @@ revSize rev = snd $ Arr.bounds rev arrDouble :: RevDeps -> RevDeps arrDouble rev = - Gr.buildG (0, 2*(revSize rev)) (Gr.edges rev) + Gr.buildG (0, 2*revSize rev) (Gr.edges rev) -------------------------------------- countUtil :: [(Version,Int,Int)] -> (Int,Int) -countUtil vcc = foldr (\(_,a, b) (as, bs) -> (a + as, b + bs)) (0,0) vcc +countUtil = foldr (\(_,a, b) (as, bs) -> (a + as, b + bs)) (0,0) toPackageMap :: [PackageId] -> Map PackageName (Set Version) -toPackageMap assocs = Map.fromListWith (Set.union) [(k, Set.singleton v) | PackageIdentifier k v <- assocs] +toPackageMap assocs = Map.fromListWith Set.union [(k, Set.singleton v) | PackageIdentifier k v <- assocs] toReverseCount :: [(Version, Int , Int)] -> ReverseCount -toReverseCount assocs = ReverseCount (fst count) (snd count) (Map.fromListWith (+) [(k, v) | (k, v, _) <- assocs]) +toReverseCount assocs = uncurry ReverseCount count (Map.fromListWith (+) [(k, v) | (k, v, _) <- assocs]) where count = countUtil assocs @@ -243,15 +241,15 @@ getDependencies :: PackageName -> Query ReverseIndex (Set PackageName) getDependencies pkg = do ReverseIndex index revdeps nodemap <- ask let packageIds = map packageId $ PackageIndex.lookupPackageName index pkg - pkgname p = packageName . (nodemap !>) $ p - return $ Set.fromList (map (pkgname) (concatMap (suc revdeps . (nodemap !)) packageIds)) + pkgname = packageName . (nodemap !>) + return $ Set.fromList (map pkgname (concatMap (suc revdeps . (nodemap !)) packageIds)) getDependenciesI :: PackageName -> Query ReverseIndex (Set PackageName) getDependenciesI pkg = do ReverseIndex index revdeps nodemap <- ask let packageIds = map packageId $ PackageIndex.lookupPackageName index pkg - pkgname p = packageName . (nodemap !>) $ p - reachables = Set.fromList (map (pkgname) (concatMap (\p -> Gr.reachable revdeps (nodemap ! p)) packageIds)) + pkgname = packageName . (nodemap !>) + reachables = Set.fromList (map pkgname (concatMap (\p -> Gr.reachable revdeps (nodemap ! p)) packageIds)) return $ Set.difference reachables (Set.singleton pkg) @@ -265,7 +263,7 @@ getReverseCount pkg = do getReverseCountId :: PackageId -> Query ReverseIndex (Int,Int) getReverseCountId pkg = do ReverseIndex _ revdeps nodemap <- ask - return $ (outdeg revdeps (nodemap ! pkg), length (Gr.reachable revdeps (nodemap ! pkg)) - 1) + return (outdeg revdeps (nodemap ! pkg), length (Gr.reachable revdeps (nodemap ! pkg)) - 1) $(makeAcidic ''ReverseIndex ['getReverseIndex diff --git a/Distribution/Server/Features/Tags.hs b/Distribution/Server/Features/Tags.hs index 7341eea03..7d363f348 100644 --- a/Distribution/Server/Features/Tags.hs +++ b/Distribution/Server/Features/Tags.hs @@ -107,7 +107,7 @@ initTagsFeature ServerEnv{serverStateDir} = do Just pkginfo -> do let pkgname = packageName pkgid tags = constructImmutableTags . pkgDesc $ pkginfo - aliases <- sequence $ map (\tag -> queryState tagAlias $ GetTagAlias tag) tags + aliases <- mapM (queryState tagAlias . GetTagAlias) tags let newtags = Set.fromList aliases updateState tagsState . SetPackageTags pkgname $ newtags runHook_ updateTag (Set.singleton pkgname, newtags) @@ -196,8 +196,8 @@ tagsFeature CoreFeature{ queryGetPackageIndex initImmutableTags = do index <- queryGetPackageIndex let calcTags = tagPackages $ constructImmutableTagIndex index - aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) $ Map.keys calcTags - let calcTags' = Map.toList . Map.fromListWith (Set.union) $ zip aliases (Map.elems calcTags) + aliases <- mapM (queryState tagsAlias . GetTagAlias) $ Map.keys calcTags + let calcTags' = Map.toList . Map.fromListWith Set.union $ zip aliases (Map.elems calcTags) forM_ calcTags' $ uncurry setCalculatedTag queryGetTagList :: MonadIO m => m [(Tag, Set PackageName)] @@ -241,13 +241,13 @@ tagsFeature CoreFeature{ queryGetPackageIndex _ -> errBadRequest "Tag not recognised" [MText "Couldn't parse tag. It should be a single tag."] -- tags on merging - constructMergedTagIndex :: forall m. (Functor m, MonadIO m) => Tag -> Tag -> PackageIndex PkgInfo -> m (PackageTags) + constructMergedTagIndex :: forall m. (Functor m, MonadIO m) => Tag -> Tag -> PackageIndex PkgInfo -> m PackageTags constructMergedTagIndex orig depr = foldM addToTags emptyPackageTags . PackageIndex.allPackagesByName where addToTags calcTags pkgList = do let info = pkgDesc $ last pkgList !pn = packageName info pkgTags <- queryTagsForPackage pn - if (Set.member depr pkgTags) + if Set.member depr pkgTags then do let newTags = Set.delete depr (Set.insert orig pkgTags) void $ updateState tagsState $ SetPackageTags pn newTags @@ -263,7 +263,7 @@ tagsFeature CoreFeature{ queryGetPackageIndex raddns <- optional $ look "raddns" rdelns <- optional $ look "rdelns" case simpleParse =<< addns of - Just (TagList add) -> do + Just (TagList add) -> case simpleParse =<< delns of Just (TagList del) -> do trustainer <- authorisedAsMaintainerOrTrustee pkgname @@ -271,7 +271,7 @@ tagsFeature CoreFeature{ queryGetPackageIndex if trustainer then do calcTags <- queryTagsForPackage pkgname - aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) add + aliases <- mapM (queryState tagsAlias . GetTagAlias) add revTags <- queryReviewTagsForPackage pkgname let tagSet = (addTags `Set.union` calcTags) `Set.difference` delTags addTags = Set.fromList aliases @@ -290,7 +290,7 @@ tagsFeature CoreFeature{ queryGetPackageIndex return () else if user then do - aliases <- sequence $ map (\tag -> queryState tagsAlias $ GetTagAlias tag) add + aliases <- mapM (queryState tagsAlias . GetTagAlias) add calcTags <- queryTagsForPackage pkgname let addTags = Set.fromList aliases `Set.difference` calcTags delTags = Set.fromList del `Set.intersection` calcTags @@ -340,11 +340,11 @@ constructImmutableTags genDesc = !ht = hasTests desc !hb = hasBenchmarks desc in licenseToTag l - ++ (if hl then [Tag "library"] else []) - ++ (if he then [Tag "program"] else []) - ++ (if ht then [Tag "test"] else []) - ++ (if hb then [Tag "benchmark"] else []) - ++ (constructCategoryTags desc) + ++ [Tag "library" | hl] -- (if hl then [Tag "library"] else []) + ++ [Tag "program" | he] + ++ [Tag "test" | ht] + ++ [Tag "benchmark" | hb] + ++ constructCategoryTags desc where licenseToTag :: License -> [Tag] licenseToTag l = case l of diff --git a/Distribution/Server/Features/Tags/State.hs b/Distribution/Server/Features/Tags/State.hs index 0bbaca568..de33e81e0 100644 --- a/Distribution/Server/Features/Tags/State.hs +++ b/Distribution/Server/Features/Tags/State.hs @@ -74,7 +74,7 @@ data TagAlias = TagAlias (Map Tag (Set Tag)) deriving (Eq, Show, Typeable) addTagAlias :: Tag -> Tag -> Update TagAlias () addTagAlias tag alias = do TagAlias m <- get - put (TagAlias (Map.insertWith (Set.union) tag (Set.singleton alias) m)) + put (TagAlias (Map.insertWith Set.union tag (Set.singleton alias) m)) lookupTagAlias :: Tag -> Query TagAlias (Maybe (Set Tag)) lookupTagAlias tag @@ -84,9 +84,9 @@ lookupTagAlias tag getTagAlias :: Tag -> Query TagAlias Tag getTagAlias tag = do TagAlias m <- ask - if tag `elem` (Map.keys m) + if tag `elem` Map.keys m then return tag - else if tag `Set.member` (foldr Set.union Set.empty $ Map.elems m) + else if tag `Set.member` foldr Set.union Set.empty (Map.elems m) then return $ head (Map.keys $ Map.filter (tag `Set.member`) m) else return tag @@ -119,7 +119,7 @@ setTags :: PackageName -> Set Tag -> PackageTags -> PackageTags setTags pkgname tagList = alterTags pkgname (keepSet tagList) setAliases :: Tag -> Set Tag -> TagAlias -> TagAlias -setAliases tag aliases (TagAlias ta) = TagAlias (Map.insertWith (Set.union) tag aliases ta) +setAliases tag aliases (TagAlias ta) = TagAlias (Map.insertWith Set.union tag aliases ta) deletePackageTags :: PackageName -> PackageTags -> PackageTags deletePackageTags name = alterTags name Nothing @@ -127,20 +127,16 @@ deletePackageTags name = alterTags name Nothing addTag :: PackageName -> Tag -> PackageTags -> Maybe PackageTags addTag name tag (PackageTags tags packages review) = let existing = Map.findWithDefault Set.empty name tags - in case tag `Set.member` existing of - True -> Nothing - False -> Just $ PackageTags (addSetMap name tag tags) - (addSetMap tag name packages) - review + in if tag `Set.member` existing then Nothing else Just $ PackageTags (addSetMap name tag tags) + (addSetMap tag name packages) + review removeTag :: PackageName -> Tag -> PackageTags -> Maybe PackageTags removeTag name tag (PackageTags tags packages review) = let existing = Map.findWithDefault Set.empty name tags - in case tag `Set.member` existing of - True -> Just $ PackageTags (removeSetMap name tag tags) - (removeSetMap tag name packages) - review - False -> Nothing + in if tag `Set.member` existing then Just $ PackageTags (removeSetMap name tag tags) + (removeSetMap tag name packages) + review else Nothing addSetMap :: (Ord k, Ord a) => k -> a -> Map k (Set a) -> Map k (Set a) addSetMap key val = Map.alter (Just . Set.insert val . fromMaybe Set.empty) key diff --git a/Distribution/Server/Features/Votes.hs b/Distribution/Server/Features/Votes.hs index ac6120c87..3ef879406 100644 --- a/Distribution/Server/Features/Votes.hs +++ b/Distribution/Server/Features/Votes.hs @@ -25,6 +25,7 @@ import qualified Data.Map as Map import qualified Data.Text as T import qualified Data.HashMap.Strict as HashMap +import Control.Monad (when) import Control.Arrow (first) import qualified Text.XHtml.Strict as X @@ -34,7 +35,7 @@ data VotesFeature = VotesFeature { votesFeatureInterface :: HackageFeature , didUserVote :: forall m. MonadIO m => PackageName -> UserId -> m Bool , pkgNumVotes :: forall m. MonadIO m => PackageName -> m Int - , pkgNumScore :: forall m. MonadIO m => PackageName -> m Float + , pkgNumScore :: forall m. MonadIO m => PackageName -> m Float , votesUpdated :: Hook (PackageName, Float) () , renderVotesHtml :: PackageName -> ServerPartE X.Html } @@ -166,9 +167,7 @@ votesFeature ServerEnv{..} guardValidPackageName pkgname success <- updateState votesState (RemoveVote pkgname uid) pkgScore <- pkgNumScore pkgname - if success - then runHook_ votesUpdated (pkgname, pkgScore) - else return () + when success $ runHook_ votesUpdated (pkgname, pkgScore) let responseMsg | success = "Package vote removed successfully." | otherwise = "User has not voted for this package." ok . toResponse $ responseMsg diff --git a/Distribution/Server/Pages/Reverse.hs b/Distribution/Server/Pages/Reverse.hs index b6efcac3a..68b570bd5 100644 --- a/Distribution/Server/Pages/Reverse.hs +++ b/Distribution/Server/Pages/Reverse.hs @@ -44,7 +44,7 @@ reverseHtmlUtil ReverseFeature{reverseResource} = ReverseHtmlUtil{..} versionBox = if hasVersion && total /= allCounts then thediv ! [theclass "notification"] << [toHtml $ "These statistics only apply to this version of " ++ display pkgname ++ ". See also ", anchor ! [href $ reverseNameUri reverseResource "" pkgname] << [toHtml "packages which depend on ", emphasize << "any", toHtml " version"], toHtml $ " (all " ++ show total ++ " of them)."] else noHtml - allCounts = fst counts + snd counts + allCounts = uncurry (+) counts otherCount = case total - allCounts of diff | diff > 0 -> paragraph << [show diff ++ " packages depend on versions of " ++ display pkgid ++ " other than this one."] _ -> noHtml @@ -56,13 +56,12 @@ reverseHtmlUtil ReverseFeature{reverseResource} = ReverseHtmlUtil{..} packageAnchor, toHtml "."] ] (0, count) -> - [ paragraph << [toHtml "No packages depend on ", + paragraph << [toHtml "No packages depend on ", if hasVersion then noHtml else toHtml "some version of ", packageAnchor, toHtml $ pageText 0 ++ " However, ", altVersions count nonPageText otherLink, - toHtml "."] - ] ++ [otherCount, statLinks] + toHtml "."] : [otherCount, statLinks] (count, count') -> [ (paragraph<<) $ [ mainVersions count pageText packageAnchor, toHtml " (listed below)." ] ++ if count' > 0 then [ toHtml " Additionally, " @@ -86,7 +85,7 @@ reverseHtmlUtil ReverseFeature{reverseResource} = ReverseHtmlUtil{..} reverseTable = thediv << table << reverseTableRows reverseTableRows = - [ tr ! [theclass "fancy"] << [ th << "Package name", th << "Version", th << "Reverse dependencies" ] ] ++ + tr ! [theclass "fancy"] << [ th << "Package name", th << "Version", th << "Reverse dependencies" ] : [ tr ! [theclass (if odd n then "odd" else "even")] << [ td << anchor ! [href $ packageLink $ PackageIdentifier (packageName pkg) $ Version [] [] ] << display (packageName pkg) , td << anchor ! (renderStatus status ++ [href $ packageLink pkg]) << display (packageVersion pkg) @@ -104,7 +103,7 @@ reverseHtmlUtil ReverseFeature{reverseResource} = ReverseHtmlUtil{..} _ -> [ paragraph << if total == flat then [toHtml "All packages which use ", toPackage pkgname, toHtml " depend on it ", anchor ! [href $ reverseNameUri reverseResource "" pkgname] << "directly", toHtml $ ". " ++ onlyPackage total] - else [toPackage pkgname, toHtml $ " has ", anchor ! [href $ reverseNameUri reverseResource "" pkgname] << num total "packages" "package", toHtml $ " which directly " ++ num' total "depend" "depends" ++ " on it, but there are more packages which depend on ", emphasize << "those", toHtml $ " packages. If you flatten the tree of reverse dependencies, you'll find " ++ show flat ++ " packages which use " ++ display pkgname ++ ", and " ++ show (flat-total) ++ " which do so without depending directly on it. All of these packages are listed below."] + else [toPackage pkgname, toHtml " has ", anchor ! [href $ reverseNameUri reverseResource "" pkgname] << num total "packages" "package", toHtml $ " which directly " ++ num' total "depend" "depends" ++ " on it, but there are more packages which depend on ", emphasize << "those", toHtml $ " packages. If you flatten the tree of reverse dependencies, you'll find " ++ show flat ++ " packages which use " ++ display pkgname ++ ", and " ++ show (flat-total) ++ " which do so without depending directly on it. All of these packages are listed below."] , paragraph << [toHtml "See also the ", anchor ! [href $ reverseStatsUri reverseResource "" pkgname] << "statistics for specific versions", toHtml $ " of " ++ display pkgname ++ "."] , reverseTable ] @@ -115,7 +114,7 @@ reverseHtmlUtil ReverseFeature{reverseResource} = ReverseHtmlUtil{..} reverseTable = thediv << table << reverseTableRows reverseTableRows = - [ tr ! [theclass "fancy"] << [ th << "Package name", th << "Total reverse dependencies" ] ] ++ + (tr ! [theclass "fancy"] << [ th << "Package name", th << "Total reverse dependencies" ]) : [ tr ! [theclass (if odd n then "odd" else "even")] << [ td << toPackage pkg , td << [ toHtml $ (show count) ++ " (", anchor ! [href $ reverseAllUri reverseResource "" pkg] << "view", toHtml ")" ] @@ -144,7 +143,7 @@ reverseHtmlUtil ReverseFeature{reverseResource} = ReverseHtmlUtil{..} versionTable = thediv << table << versionTableRows versionTableRows = - [ tr ! [theclass "fancy"] << [ th << "Version", th << "Reverse dependency count" ] ] ++ + (tr ! [theclass "fancy"] << [ th << "Version", th << "Reverse dependency count" ]) : [ tr ! [theclass (if odd n then "odd" else "even")] << [ td << anchor ! [href $ packageLink pkgid ] << display version , td << [ toHtml $ show (Map.findWithDefault 0 version versions) ++ " (" @@ -159,13 +158,13 @@ reverseHtmlUtil ReverseFeature{reverseResource} = ReverseHtmlUtil{..} -- /packages/reverse reversePackagesRender :: (PackageName -> String) -> Int -> [(PackageName, Int, Int)] -> [Html] reversePackagesRender packageLink pkgCount triples = - h2 << ("Reverse dependencies") : + h2 << "Reverse dependencies" : [ paragraph << [ "Hackage has " ++ show pkgCount ++ " packages. Here are all the packages that have package that depend on them:"] , reverseTable ] where reverseTable = thediv << table << reverseTableRows reverseTableRows = - [ tr ! [theclass "fancy"] << [ th << "Package name", th << "Total", th << "Direct" ] ] ++ + (tr ! [theclass "fancy"] << [ th << "Package name", th << "Total", th << "Direct" ]) : [ tr ! [theclass (if odd n then "odd" else "even")] << [ td << anchor ! [href $ packageLink pkgname ] << display pkgname , td << [ toHtml $ show flat ++ " (", anchor ! [href $ reverseStatsUri reverseResource "" pkgname ] << "view", toHtml ")" ] From e2e01385c42efa8adc977dd23960ffa8682f0986 Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Thu, 4 Aug 2016 18:14:46 +0530 Subject: [PATCH 15/39] Related packages A simple related packages view (currently based on bm25f results) --- Distribution/Server/Features/Html.hs | 26 ++++++++++++++++++- .../Server/Features/Html/HtmlUtilities.hs | 10 +++---- datafiles/templates/Html/package-page.html.st | 9 ++++++- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index 236053c73..e0a1560a1 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -280,6 +280,7 @@ htmlFeature env@ServerEnv{..} cacheNamesPage templates list + names htmlUsers = mkHtmlUsers user usersdetails htmlUploads = mkHtmlUploads utilities upload htmlDocUploads = mkHtmlDocUploads utilities core docsCore templates @@ -410,6 +411,7 @@ mkHtmlCore :: ServerEnv -> AsyncCache Response -> Templates -> ListFeature + -> SearchFeature -> HtmlCore mkHtmlCore ServerEnv{serverBaseURI} utilities@HtmlUtilities{..} @@ -437,6 +439,7 @@ mkHtmlCore ServerEnv{serverBaseURI} cacheNamesPage templates ListFeature{makeItemList} + SearchFeature{..} = HtmlCore{..} where cores@CoreResource{packageInPath, lookupPackageName, lookupPackageId} = coreResource @@ -504,12 +507,16 @@ mkHtmlCore ServerEnv{serverBaseURI} recentDown <- cmFind pkgname `liftM` recentPackageDownloads pkgVotes <- pkgNumVotes pkgname pkgScore <- pkgNumScore pkgname - -- myRating <- + -- TODO: myRating mdoctarblob <- queryDocumentation realpkg rdeps <- queryReverseDeps pkgname tags <- queryTagsForPackage pkgname deprs <- queryGetDeprecatedFor pkgname mreadme <- makeReadme render + pkgnames <- searchPackages [unPackageName pkgname] + let (pageResults, moreResults) = splitAt 5 pkgnames + pkgDetails <- liftIO $ makeItemList pageResults + let related = toHtml $ resultsArea pkgDetails moreResults (unPackageName pkgname) buildStatus <- renderBuildStatus documentationFeature reportsFeature realpkg @@ -535,6 +542,7 @@ mkHtmlCore ServerEnv{serverBaseURI} , "recentDownloads" $= recentDown , "votes" $= pkgVotes , "score" $= pkgScore + , "related" $= related , "hasrdeps" $= not (rdeps == ([],[])) , "rdeps" $= renderPkgPageDeps rdeps , "rdepsummary" $= renderDeps pkgname rdeps @@ -547,6 +555,22 @@ mkHtmlCore ServerEnv{serverBaseURI} deprs utilities where + resultsArea pkgDetails moreResults termsStr = + [ case pkgDetails of + [] -> toHtml "No matches" + _ -> toHtml + [ thediv << (intersperse (toHtml ", ") $ map (packageNameLink . itemName) (tail pkgDetails)) + , if null moreResults + then noHtml + else anchor ! [href moreResultsLink] + << "More results..." + ] + ] + where + moreResultsLink = + "/packages/search?" + ++ "terms=" ++ escapeURIString isUnreserved termsStr + makeReadme :: MonadIO m => PackageRender -> m (Maybe BS.ByteString) makeReadme render = case rendReadme render of Just (tarfile, _, offset, _) -> diff --git a/Distribution/Server/Features/Html/HtmlUtilities.hs b/Distribution/Server/Features/Html/HtmlUtilities.hs index 3f0bc41f3..a17d31d56 100644 --- a/Distribution/Server/Features/Html/HtmlUtilities.hs +++ b/Distribution/Server/Features/Html/HtmlUtilities.hs @@ -17,11 +17,11 @@ import Distribution.Package import Distribution.Server.Features.Users data HtmlUtilities = HtmlUtilities { - packageLink :: PackageId -> Html - , packageNameLink :: PackageName -> Html - , renderItem :: PackageItem -> Html - , makeRow :: PackageItem -> Html - , renderTags :: Set Tag -> [Html] + packageLink :: PackageId -> Html + , packageNameLink :: PackageName -> Html + , renderItem :: PackageItem -> Html + , makeRow :: PackageItem -> Html + , renderTags :: Set Tag -> [Html] , renderReviewTags :: Set Tag -> (Set Tag, Set Tag) -> PackageName -> [Html] , renderDeps :: PackageName -> ([PackageName], [PackageName]) -> Html , renderPkgPageDeps :: ([PackageName], [PackageName]) -> Html diff --git a/datafiles/templates/Html/package-page.html.st b/datafiles/templates/Html/package-page.html.st index 179c6514c..4d94c0ed0 100644 --- a/datafiles/templates/Html/package-page.html.st +++ b/datafiles/templates/Html/package-page.html.st @@ -177,7 +177,7 @@ [my rating : $myrating$] $endif$ - [Clear Rating] + [clear rating]
                • λ
                • λ
                  • @@ -185,10 +185,17 @@
                + +                 + + + + +
                Name
                DLs
                Rating
                Description
                RDeps
                Tags
                Maintainer
                Score
                Description
                RDeps
                Tags
                Maintainer
                Related$related$
                Status $buildStatus$
                From 879a1c702246ae1d0721d55ee97995192693a198 Mon Sep 17 00:00:00 2001 From: Soorya Narayan Date: Sat, 13 Aug 2016 13:33:18 +0530 Subject: [PATCH 16/39] WebGL graph of packages and dependencies A visualization of the package database --- Distribution/Server/Features/Html.hs | 25 +- .../Server/Features/ReverseDependencies.hs | 29 +- datafiles/static/graph/graph.css | 1 + datafiles/static/graph/jquery.min.js | 5 + datafiles/static/graph/tmpl.js | 86 + datafiles/static/graph/vivagraph.js | 6844 +++++++++++++++++ datafiles/templates/Html/graph.html.st | 299 + 7 files changed, 7286 insertions(+), 3 deletions(-) create mode 100644 datafiles/static/graph/graph.css create mode 100644 datafiles/static/graph/jquery.min.js create mode 100644 datafiles/static/graph/tmpl.js create mode 100644 datafiles/static/graph/vivagraph.js create mode 100644 datafiles/templates/Html/graph.html.st diff --git a/Distribution/Server/Features/Html.hs b/Distribution/Server/Features/Html.hs index e0a1560a1..17be84753 100644 --- a/Distribution/Server/Features/Html.hs +++ b/Distribution/Server/Features/Html.hs @@ -133,6 +133,7 @@ initHtmlFeature env@ServerEnv{serverTemplatesDir, serverTemplatesMode, , "package-page.html" , "tag-interface.html" , "tag-edit.html" + , "graph.html" ] @@ -433,7 +434,7 @@ mkHtmlCore ServerEnv{serverBaseURI} PackageContentsFeature{packageRender} HtmlTags{..} HtmlReverse{..} - ReverseFeature{queryReverseDeps} + ReverseFeature{queryReverseDeps, revJSON} HtmlPreferred{..} cachePackagesPage cacheNamesPage @@ -472,6 +473,18 @@ mkHtmlCore ServerEnv{serverBaseURI} , resourceGet = [("html", serveTagIndex)] } + , (resourceAt "/packages/graph.json" ) { + resourceDesc = [(GET, "Show JSON of package dependency information")] + , resourceGet = [("json", + serveGraphJSON)] + } + + , (resourceAt "/packages/graph" ) { + resourceDesc = [(GET, "Show graph of package dependency information")] + , resourceGet = [("html", + serveGraph)] + } + , (extendResource $ corePackagesPage cores) { resourceDesc = [(GET, "Show package index")] , resourceGet = [("html", const $ readAsyncCache cachePackagesPage)] @@ -611,6 +624,16 @@ mkHtmlCore ServerEnv{serverBaseURI} , "content" $= "A browsable index of all the packages" , "tabledata" $= tabledata ] + serveGraphJSON :: DynamicPath -> ServerPartE Response + serveGraphJSON _ = do + graph <- revJSON + ok . toResponse $ graph + + serveGraph :: DynamicPath -> ServerPartE Response + serveGraph _ = do + template <- getTemplate templates "graph.html" + return $ toResponse $ template [] + serveDistroMonitorPage :: DynamicPath -> ServerPartE Response serveDistroMonitorPage dpath = do pkgname <- packageInPath dpath diff --git a/Distribution/Server/Features/ReverseDependencies.hs b/Distribution/Server/Features/ReverseDependencies.hs index 344917f41..e62ee328d 100644 --- a/Distribution/Server/Features/ReverseDependencies.hs +++ b/Distribution/Server/Features/ReverseDependencies.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE RankNTypes, NamedFieldPuns, RecordWildCards #-} +{-# LANGUAGE DeriveGeneric, RankNTypes, NamedFieldPuns, RecordWildCards #-} module Distribution.Server.Features.ReverseDependencies ( ReverseFeature(..), ReverseCount(..), @@ -37,6 +37,9 @@ import qualified Data.Set as Set import Control.Monad (liftM, forever) import Control.Monad.Trans (MonadIO) import Control.Concurrent.Chan +import Data.Aeson +import GHC.Generics hiding (packageName) +import Data.ByteString.Lazy (ByteString) data ReverseFeature = ReverseFeature { reverseFeatureInterface :: HackageFeature, @@ -54,7 +57,8 @@ data ReverseFeature = ReverseFeature { revPackageFlat :: forall m. MonadIO m => PackageName -> m [(PackageName, Int)], revPackageStats :: forall m. MonadIO m => PackageName -> m ReverseCount, revPackageSummary :: forall m. MonadIO m => PackageId -> m (Int, Int), - revSummary :: forall m. MonadIO m => m [(PackageName, Int, Int)] + revSummary :: forall m. MonadIO m => m [(PackageName, Int, Int)], + revJSON :: forall m. MonadIO m => m ByteString } instance IsHackageFeature ReverseFeature where @@ -133,6 +137,18 @@ data ReversePageRender = ReversePageRender { rendPageTotal :: Int } +-- data Node = Node {id::Int, label::String} deriving Generic +data Edge = Edge { + id::Int, + name::String, + deps::[String] + } deriving Generic +-- data JGraph = JGraph { nodes::[Node], edges::[Edge]} deriving Generic +-- instance ToJSON Node +instance ToJSON Edge +-- instance ToJSON JGraph +-- instance ToJSON PackageName + reverseFeature :: CoreFeature -> Chan (IO [PackageId]) -> VersionsFeature @@ -220,6 +236,15 @@ reverseFeature CoreFeature{..} revs <- queryReverseIndex return $ perPackageReverse dispInfo revs pkgname + revJSON :: MonadIO m => m ByteString + revJSON = do + ReverseIndex _ revdeps nodemap <- queryReverseIndex + let assoc = takeWhile (\(a,_) -> a < Bimap.size nodemap) $ Arr.assocs . Gr.transposeG $ revdeps + nodeToString node = unPackageName (packageName (nodemap Bimap.!> node)) + -- nodes = map (uncurry Node) $ map (\n -> (fst n, nodeToString (fst n))) assoc + edges = map (\(a,b) -> Edge a (nodeToString a) (map (\x-> nodeToString x) b)) assoc + return $ encode edges + revDisplayInfo :: MonadIO m => m VersionIndex revDisplayInfo = do pkgIndex <- queryGetPackageIndex diff --git a/datafiles/static/graph/graph.css b/datafiles/static/graph/graph.css new file mode 100644 index 000000000..4ad5cafc2 --- /dev/null +++ b/datafiles/static/graph/graph.css @@ -0,0 +1 @@ + *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */.label,sub,sup{vertical-align:baseline}.search ul,hr{box-sizing:content-box}hr,img{border:0}body,figure{margin:0}.btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px}.form-control-feedback,.navigation-help,.node-hover-list,.node-hover-tooltip,.steering,a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}b,optgroup,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0}mark{background:#ff0;color:#000}sub,sup{font-size:75%;line-height:0;position:relative}sup{top:-.5em}sub{bottom:-.25em}img{vertical-align:middle}svg:not(:root){overflow:hidden}hr{height:0}pre,textarea{overflow:auto}code,kbd,pre,samp{font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}.glyphicon,address{font-style:normal}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{blockquote,img,pre,tr{page-break-inside:avoid}*,:after,:before{background:0 0!important;color:#000!important;box-shadow:none!important;text-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999}thead{display:table-header-group}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}.btn,.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-warning.active,.btn-warning:active,.btn.active,.btn:active,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover,.form-control,.navbar-toggle,.open>.dropdown-toggle.btn-danger,.open>.dropdown-toggle.btn-default,.open>.dropdown-toggle.btn-info,.open>.dropdown-toggle.btn-primary,.open>.dropdown-toggle.btn-warning{background-image:none}@font-face{font-family:'Glyphicons Halflings';src:url(glyphicons-halflings-regular.eot);src:url(glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(glyphicons-halflings-regular.woff2) format('woff2'),url(glyphicons-halflings-regular.woff) format('woff'),url(glyphicons-halflings-regular.ttf) format('truetype'),url(glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before,.glyphicon-btc:before,.glyphicon-xbt:before{content:"\e227"}.glyphicon-jpy:before,.glyphicon-yen:before{content:"\00a5"}.glyphicon-rub:before,.glyphicon-ruble:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:transparent}body{font-size:14px;line-height:1.42857143;color:#333}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}dt,kbd kbd,label{font-weight:700}address,blockquote .small,blockquote footer,blockquote small,dd,dt,pre{line-height:1.42857143}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{background-color:#fcf8e3;padding:.2em}.list-inline,.list-unstyled{padding-left:0;list-style:none}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}pre code,table{background-color:transparent}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}dl,ol,ul{margin-top:0}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child,ol ol,ol ul,ul ol,ul ul{margin-bottom:0}address,dl{margin-bottom:20px}ol,ul{margin-bottom:10px}.list-inline{margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.container{width:750px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;color:#777}legend,pre{display:block;color:#333}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}code,kbd{padding:2px 4px;font-size:90%}caption,th{text-align:left}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;box-shadow:none}pre{padding:9.5px;margin:0 0 10px;font-size:13px;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}.container,.container-fluid{margin-right:auto;margin-left:auto}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;border-radius:0}.container,.container-fluid{padding-left:15px;padding-right:15px}.pre-scrollable{overflow-y:scroll}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.row{margin-left:-15px;margin-right:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}caption{padding-top:8px;padding-bottom:8px;color:#777}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered,.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover,.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}table col[class*=col-]{position:static;float:none;display:table-column}table td[class*=col-],table th[class*=col-]{position:static;float:none;display:table-cell}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{overflow-x:auto;min-height:.01%}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset,legend{padding:0;border:0}fieldset{margin:0;min-width:0}legend{width:100%;margin-bottom:20px;font-size:21px;line-height:inherit;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}.form-control,output{font-size:14px;line-height:1.42857143;color:#555;display:block}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px}output{padding-top:7px}.form-control{width:100%;height:34px;padding:6px 12px;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .form-control-feedback,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.form-control::-ms-expand{border:0;background-color:transparent}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-left:-20px;margin-top:4px\9}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}.checkbox-inline.disabled,.checkbox.disabled label,.radio-inline.disabled,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio label,fieldset[disabled] .radio-inline,fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0;min-height:34px}.form-control-static.input-lg,.form-control-static.input-sm{padding-left:0;padding-right:0}.form-group-sm .form-control,.input-sm{padding:5px 10px;border-radius:3px;font-size:12px}.input-sm{height:30px;line-height:1.5}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;line-height:1.5}.form-group-lg .form-control,.input-lg{border-radius:6px;padding:10px 16px;font-size:18px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;line-height:1.3333333}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;line-height:1.3333333}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center}.collapsing,.dropdown,.dropup{position:relative}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .form-control-feedback,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-control-static,.form-inline .form-group{display:inline-block}.form-inline .control-label,.form-inline .form-group{margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}.form-horizontal .control-label{text-align:right;margin-bottom:0;padding-top:7px}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;touch-action:manipulation;cursor:pointer;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:dotted thin;outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.btn-default:hover,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary.active,.btn-primary:active,.btn-primary:hover,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success.active,.btn-success:active,.btn-success:hover,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info.active,.btn-info:active,.btn-info:hover,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.btn-warning:hover,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger.active,.btn-danger:active,.btn-danger:hover,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#337ab7;font-weight:400;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{height:0;overflow:hidden;-webkit-transition-property:height,visibility;transition-property:height,visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu-right,.dropdown-menu.pull-right{left:auto;right:0}.dropdown-header,.dropdown-menu>li>a{display:block;padding:3px 20px;line-height:1.42857143;white-space:nowrap}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle,.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child,.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child),.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn,.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{clear:both;font-weight:400;color:#333}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;outline:0;background-color:#337ab7}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{font-size:12px;color:#777}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.nav-justified>.dropdown .dropdown-menu,.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn .caret,.btn-group>.btn:first-child{margin-left:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn-lg .caret{border-width:5px 5px 0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child:not(:first-child){border-radius:0 0 4px 4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.nav>li,.nav>li>a{display:block;position:relative}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li>a{padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px;margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0;border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-justified>li,.nav-stacked>li{float:none}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar-collapse{overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar{border-radius:4px}.navbar-header{float:left}.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-left:0;padding-right:0}}.embed-responsive,.modal,.modal-open,.progress{overflow:hidden}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}.navbar-static-top{z-index:1000;border-width:0 0 1px}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}.progress-bar-striped,.progress-striped .progress-bar,.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}@media (min-width:768px){.navbar-toggle{display:none}.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin:8px -15px}@media (min-width:768px){.navbar-form .form-control-static,.navbar-form .form-group{display:inline-block}.navbar-form .control-label,.navbar-form .form-group{margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}}.breadcrumb>li,.pagination{display:inline-block}.btn .badge,.btn .label{top:-1px;position:relative}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-radius:4px 4px 0 0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-nav>li>a,.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>li>a,.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li+li:before{content:"/\00a0";padding:0 5px;color:#ccc}.breadcrumb>.active{color:#777}.pagination{padding-left:0;margin:20px 0;border-radius:4px}.pager li,.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#337ab7;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.close,.list-group-item>.badge,.pager .next>a,.pager .next>span{float:right}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;background-color:#337ab7;border-color:#337ab7;cursor:default}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.badge,.label{font-weight:700;line-height:1;white-space:nowrap;text-align:center}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;background-color:#fff;cursor:not-allowed}a.badge:focus,a.badge:hover,a.label:focus,a.label:hover{color:#fff;cursor:pointer;text-decoration:none}.label{display:inline;padding:.2em .6em .3em;font-size:75%;border-radius:.25em}.label:empty{display:none}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;color:#fff;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.media-object,.thumbnail{display:block}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.jumbotron,.jumbotron .h1,.jumbotron h1{color:inherit}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;background-color:#eee}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.alert,.thumbnail{margin-bottom:20px}.alert .alert-link,.close{font-weight:700}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px;padding-left:15px;padding-right:15px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-left:60px;padding-right:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-left:auto;margin-right:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.modal,.modal-backdrop{top:0;right:0;bottom:0;left:0}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-striped .progress-bar-info,.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{zoom:1;overflow:hidden}.media-body{width:10000px}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{text-decoration:none;color:#555;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{background-color:#eee;color:#777;cursor:not-allowed}.carousel-indicators li,.in-degree,.node-focus,.out-degree,button.close{cursor:pointer}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.panel-heading>.dropdown .dropdown-toggle,.panel-title,.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-title,.panel>.list-group,.panel>.panel-collapse>.list-group,.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;font-size:16px}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel-group .panel-heading,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-responsive:last-child>.table:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-left-radius:3px;border-bottom-right-radius:3px}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.table-responsive:first-child>.table:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.list-group+.panel-footer,.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-left:15px;padding-right:15px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;left:0;bottom:0;height:100%;width:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{font-size:21px;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.popover,.tooltip{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:400;letter-spacing:normal;line-break:auto;line-height:1.42857143;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;text-decoration:none}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;background:0 0;border:0;-webkit-appearance:none}.modal-content,.popover{background-clip:padding-box}.modal{display:none;position:fixed;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);outline:0}.modal-backdrop{position:fixed;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}.tooltip.top-left .tooltip-arrow,.tooltip.top-right .tooltip-arrow{bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;text-align:left;text-align:start;font-size:12px;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px}.tooltip.top-right .tooltip-arrow{left:5px}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow,.tooltip.bottom-left .tooltip-arrow,.tooltip.bottom-right .tooltip-arrow{border-width:0 5px 5px;border-bottom-color:#000;top:0}.tooltip.bottom .tooltip-arrow{left:50%;margin-left:-5px}.tooltip.bottom-left .tooltip-arrow{right:5px;margin-top:-5px}.tooltip.bottom-right .tooltip-arrow{left:5px;margin-top:-5px}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;text-align:left;text-align:start;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.carousel-caption,.carousel-control{color:#fff;text-shadow:0 1px 2px rgba(0,0,0,.6);text-align:center}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.carousel,.carousel-inner{position:relative}.popover>.arrow{border-width:11px}.popover>.arrow:after{border-width:10px;content:""}.popover.top>.arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,.25);bottom:-11px}.popover.top>.arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.left>.arrow:after,.popover.right>.arrow:after{content:" ";bottom:-10px}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,.25)}.popover.right>.arrow:after{left:1px;border-left-width:0;border-right-color:#fff}.popover.bottom>.arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25);top:-11px}.popover.bottom>.arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;border-right-width:0;border-left-color:#fff}.carousel-inner{overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-moz-transition:-moz-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;-moz-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;-moz-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0);left:0}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0);left:0}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);left:0}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;background-color:rgba(0,0,0,0)}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)}.carousel-control:focus,.carousel-control:hover{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;margin-top:-10px;z-index:5;display:inline-block}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;line-height:1;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;margin-left:-30%;padding-left:0;list-style:none;text-align:center}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;border:1px solid #fff;border-radius:10px;background-color:#000\9;background-color:rgba(0,0,0,0)}.carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff}.carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px}.carousel-caption .btn,.text-hide{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{content:" ";display:table}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.hidden,.visible-lg,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;background-color:transparent;border:0}.affix{position:fixed}.steering,.steering .inner{position:absolute;top:50%;left:50%}@-ms-viewport{width:device-width}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}.visible-xs-block{display:block!important}.visible-xs-inline{display:inline!important}.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}.visible-sm-block{display:block!important}.visible-sm-inline{display:inline!important}.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}.visible-md-block{display:block!important}.visible-md-inline{display:inline!important}.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}.visible-lg-block{display:block!important}.visible-lg-inline{display:inline!important}.visible-lg-inline-block{display:inline-block!important}.hidden-lg{display:none!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}.hidden-print{display:none!important}}.steering{width:200px;height:200px;z-index:1;margin-left:-100px;margin-top:-100px;border-radius:200px;border:2px solid rgba(255,255,255,.6)}.steering .inner{width:100px;height:100px;margin-left:-50px;margin-top:-50px;border-radius:100px;border:2px solid rgba(255,255,255,.2)}.steering .steering-help{position:fixed;color:rgba(255,255,255,.9);bottom:12px;font-family:'PT Sans',sans-serif;font-size:large;left:50%;margin-left:-187px}#app,.graph-full-size,.label,.navigation-help,.node-details,.node-hover-list,.search,.window-container{position:absolute}.node-details h2,.node-details h4{margin:0;font-family:'PT Sans',sans-serif}.node-details{width:395px;left:16px;bottom:12px;padding:12px;z-index:1;font-family:'PT Sans',sans-serif;background:rgba(0,0,0,.85);border:1px solid grey;color:#fff}.node-details h4{display:block;display:-webkit-box;max-width:400px;height:50.4px;font-size:18px;line-height:1.4;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;text-overflow:ellipsis}.node-details h2{text-align:center}.node-details .small{text-align:center;color:#999}@media (max-width:768px){.node-details{right:12px;width:inherit}.node-details .info-block{padding-left:0}.node-details .info-block a{display:inline-block;margin:0 7px}}.node-details .info-block a{font-size:18px}.github-avatar-detail{width:50px;margin-left:-16px;margin-right:8px;float:left}.search{top:12px;z-index:1}.search .search-results{padding-top:12px;background:rgba(0,0,0,.85)}.search .search-results h4{margin:0 0 5px;padding:0 0 5px 20px}.search .scroll-wrapper{border-top:1px solid grey;height:250px;overflow:hidden}.search ul{overflow-y:scroll;overflow-x:hidden;width:100%;height:100%;color:#fff;list-style:none;margin:0;padding:0 20px 0 0}.search ul li{height:25px}#app,.graph-full-size,.search ul li a{width:100%;height:100%}.search ul li a{opacity:.5;color:#fff;text-decoration:none;display:block;margin:0;padding:0 0 0 20px;line-height:25px;white-space:nowrap}.search ul li a:focus,.search ul li a:hover{text-decoration:none;opacity:1;background:rgba(26,26,26,.95)}.search .search-form input{width:100%;background:rgba(26,26,26,.5);color:#fff;border-radius:0;border:0}.search .search-form .input-group{border:1px solid grey}.search .search-form .input-group.focused,.search .search-form .input-group:hover{border-color:#fff}.search .search-form .input-group.focused button.btn,.search .search-form .input-group:hover button.btn{background:#66afe9}.search .search-form button.btn{color:#fff;border-radius:0;background:grey}.search h4{color:#fff}.search h4 .small{opacity:.5}body{background-color:#000;font-family:Roboto,sans-serif}#app{overflow:auto}.graph-full-size{top:0;left:0;overflow:hidden}h1,h2{color:#efefef}h4{font-family:'PT Sans',sans-serif}.window-container{background-color:rgba(0,0,0,.8);color:#7F7F7F}.window-list-content{overflow-y:auto;overflow-x:hidden;max-height:200px}.search-results-window{left:16px;top:47px;padding:10px;width:395px}.degree-results-window{left:16px;bottom:87px;padding:10px;width:395px}.no-overflow{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.window-title strong{color:#fff;font-weight:400;font-size:1.2em}.window-title .node-name{color:#fff}.label{color:#fff;background:#000;z-index:1}.loading{padding:10px;left:10px;top:48px}.about{padding:10px;right:10px;top:0}@media (max-width:768px){.degree-results-window{display:none}.about{padding:10px;right:13px;bottom:22px;top:inherit}}.node-hover-tooltip{position:absolute;background:rgba(0,0,0,.8);color:#fff;padding:4px 10px;min-width:200px;border:1px solid grey}.in-degree,.window-indegree{color:#90EE90}.node-hover-tooltip span{margin:0 5px}.out-degree,.window-outdegree{color:#F08080}.node-hover-list{background:#000;right:-20px;bottom:10px;height:150px;color:#fff;padding:4px;width:220px;overflow-y:scroll}.node-hover-list ul{padding:0}.node-hover-list li{list-style-type:none}.vcenter{display:inline-block;vertical-align:middle;float:none}a.reset-color,a.reset-color:focus,a.reset-color:hover{text-decoration:none;color:inherit}a.media:focus,a.media:hover{text-decoration:none;color:#FF008C;border:none}a.media{color:#fff;background-color:#000;border:none}.error{color:pink}.error-details{color:wheat}.navigation-help{background-color:rgba(0,0,0,.55);padding:7px;right:20px;top:50%;transform:translateY(-50%);font-family:Roboto,sans-serif}.navigation-help h3{color:#fff;border-bottom:1px solid #fff;padding-bottom:6px;margin-top:2px}.navigation-help code{font-family:'PT Sans',sans-serif;font-size:100%;color:#fff;background-color:inherit}.navigation-help code.important-key{color:#90EE90}.navigation-help td{color:#999;text-align:right}.navigation-help td:nth-child(even){text-align:left}.navigation-help tr.spacer-row{border-bottom:10px solid transparent} diff --git a/datafiles/static/graph/jquery.min.js b/datafiles/static/graph/jquery.min.js new file mode 100644 index 000000000..e83647587 --- /dev/null +++ b/datafiles/static/graph/jquery.min.js @@ -0,0 +1,5 @@ +/*! jQuery v1.12.4 | (c) jQuery Foundation | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0; +}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
                a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,"
                ","
                "],area:[1,"",""],param:[1,"",""],thead:[1,"","
                "],tr:[2,"","
                "],col:[2,"","
                "],td:[3,"","
                "],_default:l.htmlSerialize?[0,"",""]:[1,"X
                ","
                "]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/
              "!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("