Gitblit

From: James Moger Date: Thu, 16 Feb 2012 22:46:34 +0000 (-0500) Subject: Update to Bootstrap 2.0 X-Git-Tag: v0.9.0~97 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3cc6e2de29a0fa33dd585e938e1614a6dd5f9755;p=gitblit.git Update to Bootstrap 2.0 --- diff --git a/.gitignore b/.gitignore index 6988e3bf..1bac5096 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,8 @@ /src/WEB-INF/reference.properties /bin/ /.settings/ -/javadoc -/express -/build-demo.xml -/users.conf +/javadoc +/express +/build-demo.xml +/users.conf +*.directory diff --git a/build.xml b/build.xml index 016de49d..688f2552 100644 --- a/build.xml +++ b/build.xml @@ -227,9 +227,8 @@ - - - + + @@ -710,9 +709,8 @@ - - - + + diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties index fb911237..27b0d1f9 100644 --- a/distrib/gitblit.properties +++ b/distrib/gitblit.properties @@ -282,7 +282,8 @@ web.mountParameters = true # # # -# Add *org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to *CATALINA_OPTS* +# Add *-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to your +# *CATALINA_OPTS* or to your JVM launch parameters # # SINCE 0.5.2 web.forwardSlashCharacter = / diff --git a/docs/00_index.mkd b/docs/00_index.mkd index a0438eef..7b565bda 100644 --- a/docs/00_index.mkd +++ b/docs/00_index.mkd @@ -1,10 +1,10 @@ ## What is Gitblit?

Current Release %VERSION% (%BUILDDATE%) changelog -

Download Gitblit GO

-

Download Gitblit WAR

-

Download Gitblit Express BETA

-

Download Gitblit Manager

+

Download Gitblit GO

+

Download Gitblit WAR

+

Download Gitblit Express BETA

+

Download Gitblit Manager

Gitblit API | Gitblit Federation Client
@@ -12,7 +12,7 @@

- +

@@ -47,7 +47,7 @@ All dependencies are bundled. All dependencies are bundled. -### Express: For the Cloud BETA +### Express: For the Cloud BETA *Gitblit Express* is a prepared distribution for [RedHat's OpenShift][rhcloud] cloud service. All dependencies are bundled. diff --git a/docs/01_screenshots.mkd b/docs/01_screenshots.mkd index dcc02379..12eff149 100644 --- a/docs/01_screenshots.mkd +++ b/docs/01_screenshots.mkd @@ -1,121 +1,138 @@ ## Screenshots -

License	Apache License, version 2.0
Sources	GitHub & GoogleCode

- - - +### Gitblit GO/WAR - +

+ +
Repository List
+
+ +
Repository List (Admin)
+
+ +
Activity
+
+ +
Users & Teams
+
+ +
New User
+
+ +
New Team
+
+ +
Edit Repository
+
+ +
Repository Summary
+
+ +
Repository Log
+
+ +
Repository Tags
+
+ +
Repository Tree
+
+ +
Commit Page
+
+ +
Commit Diff
+
+ +
Branch Metrics
+
+ +
Blob View with Syntax Highlighting
+
+ +
Blame
+
+ +
Federation Panels
+
+ +
Detailed Status of a Registration
+
+ +
Send Proposal
+
+ +
Empty Repository
+

- +### Gitblit Manager - - - - - - - - - - - - - - +

Settings Panel

+ +

+

+

Status Panel

+

+ -

Gitblit GO/WAR
- - Repository List -	- - Repository List (Admin) -	- - Activity -
- - Users & Teams -	- - New User -	- - New Team -
- - Edit Repository -	- - Repository Summary -	- - Repository Log -
- - Repository Tags -	- - Repository Tree -	- - Commit Page -
- - Commit Diff -	- - Branch Metrics -	- - Blob View with Syntax Highlighting -
- - Blame -	- - Federation Panels -	- - Detailed Status of a Registration -
- - Send Proposal -	- - Empty Repository -	-
Gitblit Manager
- - Repositories Panel -	- - Search Dialog -	- - Activity Panel -
- - Subscriptions Dialog -	- - Users Panel -	+ + + + Repositories Panel + + + + Search Dialog + + + + Activity Panel + + + + Subscriptions Dialog + + + + Users Panel + + - Settings Panel -
- - Status Panel -	- - Edit Repository Settings -	- - Edit Repository Access Restriction -
- - Edit Repository Federation Settings -	- - Edit User Dialog -

\ No newline at end of file +

+ +
Edit Repository Settings
+
+ +
Edit Repository Access Restriction
+
+ +
Edit Repository Federation Settings
+
+ +
Edit User Dialog
+

\ No newline at end of file diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd index 624ef53c..1160d8e9 100644 --- a/docs/01_setup.mkd +++ b/docs/01_setup.mkd @@ -86,6 +86,7 @@ Command-Line parameters override the values in `gitblit.properties` at runtime. --useNio Use NIO Connector else use Socket Connector. --httpPort HTTP port for to serve. (port <= 0 will disable this connector) --httpsPort HTTPS port to serve. (port <= 0 will disable this connector) + --ajpPort AJP port to serve. (port <= 0 will disable this connector) --storePassword Password for SSL (https) keystore. --shutdownPort Port for Shutdown Monitor to listen on. (port <= 0 will disable this monitor) --tempFolder Folder for server to extract built-in webapp diff --git a/docs/02_federation.mkd b/docs/02_federation.mkd index 0aaae4fa..da0e6ef2 100644 --- a/docs/02_federation.mkd +++ b/docs/02_federation.mkd @@ -191,7 +191,7 @@ By default, federated repositories can not be pushed to, they are read-only by t ## Federation Pull Registration Keys - +

diff --git a/docs/02_rpc.mkd b/docs/02_rpc.mkd index 5cd0052d..84446f5b 100644 --- a/docs/02_rpc.mkd +++ b/docs/02_rpc.mkd @@ -37,7 +37,7 @@ At present, Gitblit does not yet support retrieving Git objects (commits, etc) v The Gitblit API includes methods for retrieving and interpreting RSS feeds. The Gitblit Manager uses these methods to allow branch activity monitoring and repository searching. -

federation.N.url	string	the url of the origin Gitblit instance (required)

+

@@ -58,7 +58,7 @@ The Gitblit API includes methods for retrieving and interpreting RSS feeds. The ## JSON Remote Procedure Call (RPC) Interface ### RPC Protocol Versions -

url parameter	default	description
standard query
repository	required	repository name is part of the url (see examples below)

+

@@ -67,7 +67,7 @@ The Gitblit API includes methods for retrieving and interpreting RSS feeds. The

Release	Protocol Version
Gitblit v0.7.0	1 (inferred version)

### RPC Request and Response Types - +

@@ -103,7 +103,7 @@ The Gitblit API includes methods for retrieving and interpreting RSS feeds. The

url parameters		required user permission	protocol version	json
req=	name=	required user permission	protocol version	post body	response body
web.enableRpcServlet=true

### RPC/HTTP Response Codes - +

diff --git a/docs/03_faq.mkd b/docs/03_faq.mkd index 0d41f623..6831f420 100644 --- a/docs/03_faq.mkd +++ b/docs/03_faq.mkd @@ -48,7 +48,7 @@ This is likely an url encoding/decoding problem with forward slashes: http://192.168.1.2/log/myrepo.git/refs%2Fheads%2Fmaster **NOTE:** -You can not trust the url in the address bar of your browser since your browser may *prettify* the url. When in doubt, *View Source* of the generated html to confirm the *href*. +You can not trust the url in the address bar of your browser since your browser may decode it for presentation. When in doubt, *View Source* of the generated html to confirm the *href*. There are two possible workarounds for this issue. In `gitblit.properties` or `web.xml`: @@ -59,7 +59,7 @@ There are two possible workarounds for this issue. In `gitblit.properties` or ` You must ensure that the proxy does not decode and then re-encode request urls with interpretation of forward-slashes (*%2F*). If your proxy layer does re-encode embedded forward-slashes then you may not be able to browse grouped repositories or logs, branches, and tags **unless** you set *web.mountParameters=false*. -If you are using Apache mod_proxy, specify [AllowEncodedSlashes NoDecode](http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes). +If you are using Apache mod_proxy you may have luck with specifying [AllowEncodedSlashes NoDecode](http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes). ### Running Gitblit on Tomcat @@ -67,7 +67,7 @@ Tomcat takes the extra precaution of [disallowing embedded slashes by default](h You have a few options on how to handle this scenario: 1. [Tweak Tomcat](http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10) -Add *org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to *CATALINA_OPTS* +Add *-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to *CATALINA_OPTS* or to your JVM launch parameters 2. *web.mountParameters = false* and use non-pretty, parameterized urls 3. *web.forwardSlashCharacter = !* which tells Gitblit to use **!** instead of **/** diff --git a/docs/04_design.mkd b/docs/04_design.mkd index d4ddbc93..4fbb2a13 100644 --- a/docs/04_design.mkd +++ b/docs/04_design.mkd @@ -11,6 +11,7 @@ The following dependencies are bundled with Gitblit. - [Bootstrap](http://twitter.github.com/bootstrap) (Apache 2.0) +- [GLYPHICONS](http://glyphicons.com) (Creative Commons CC-BY) - [Clippy](https://github.com/mojombo/clippy) (MIT) - [google-code-prettify](http://code.google.com/p/google-code-prettify) (Apache 2.0) - [Commons Daemon](http://commons.apache.org/daemon) (Apache 2.0) diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index e82c2741..117c8cf8 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -16,7 +16,7 @@ #### additions - Added a built-in AJP connector for integrating Gitblit GO into an Apache mod_proxy setup (issue 59) - **New:** *server.ajpPort = 0* + **New:** *server.ajpPort = 0* **New:** *server.ajpBindInterface = localhost* - On the Repositories page show a bang *!* character in the color swatch of a repository with a working copy (issue 49) Push requests to these repositories will be rejected. @@ -32,12 +32,23 @@ Push requests to these repositories will be rejected. - Fixed username case-sensitivity issues (issue 43) - Disregard searching a subfolder if Gitblit does not have filesystem permissions (Github/lemval issue 51) +#### dependency changes + +- updated to Bootstrap 2.0 +- added GLYPHICONS (as bundled with Bootstrap 2.0) + +

+ +### Older Releases + **0.8.2** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.2.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.2.war) | [express](http://code.google.com/p/gitblit/downloads/detail?name=express-0.8.2.zip) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.8.2.zip) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=manager-0.8.2.zip) | [api](http://code.google.com/p/gitblit/downloads/detail?name=gbapi-0.8.2.zip)) based on [JGit 1.2.0 (201112221803-r)][jgit] *released 2012-01-13* #### fixes - Fixed bug when upgrading from users.properties to users.conf (issue 41) +

+ **0.8.1** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.1.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.1.war) | [express](http://code.google.com/p/gitblit/downloads/detail?name=express-0.8.1.zip) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.8.1.zip) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=manager-0.8.1.zip) | [api](http://code.google.com/p/gitblit/downloads/detail?name=gbapi-0.8.1.zip)) based on [JGit 1.2.0 (201112221803-r)][jgit] *released 2012-01-11* #### fixes @@ -45,6 +56,8 @@ Push requests to these repositories will be rejected. - Include missing icon resource for the manager (issue 40) - Fixed sendmail.groovy message content with incorrect tag/branch labels +

+ **0.8.0** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.0.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.0.war) | [express](http://code.google.com/p/gitblit/downloads/detail?name=express-0.8.0.zip) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.8.0.zip) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=manager-0.8.0.zip) | [api](http://code.google.com/p/gitblit/downloads/detail?name=gbapi-0.8.0.zip)) based on [JGit 1.2.0 (201112221803-r)][jgit] *released 2012-01-11* #### additions @@ -78,7 +91,7 @@ The original `users.properties` file and it's corresponding implementation are * - JavaScript-based 3-step (click, ctrl+c, enter) *copy to clipboard* of the primary repository url in the event that you do not want to use Flash on your installation - Empty repositories now link to an *empty repository* page which gives some direction to the user for the next step in using Gitblit. This page displays the primary push/clone url of the repository and gives sample syntax for the git command-line client. (issue 31) - Repositories with a *gh-pages* branch will now have a *pages* link which will serve the content of this branch. All resource requests are against the repository, Gitblit does not checkout/export this branch to a temporary filesystem. Jekyll templating is not supported. -- Gitblit Express bundle to get started running Gitblit on RedHat's OpenShift cloud BETA +- Gitblit Express bundle to get started running Gitblit on RedHat's OpenShift cloud BETA #### changes @@ -98,7 +111,7 @@ This change helps adoption of GO in environments without an internet connection - added Groovy 1.8.5 - added Clippy (bundled) -### Older Releases +

**0.7.0** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.7.0.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.7.0.war) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.7.0.zip) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=manager-0.7.0.zip) | [api](http://code.google.com/p/gitblit/downloads/detail?name=gbapi-0.7.0.zip)) based on [JGit 1.1.0 (201109151100-r)][jgit] *released 2011-11-11* @@ -134,6 +147,8 @@ This change helps adoption of GO in environments without an internet connection - updated: MarkdownPapers 1.2.5 - updated: Wicket 1.4.19 +

+ **0.6.0** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.6.0.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.6.0.war) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.6.0.zip)) based on [JGit 1.1.0 (201109151100-r)][jgit] *released 2011-09-27* - added: federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances. This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit. @@ -153,6 +168,8 @@ This change helps adoption of GO in environments without an internet connection - fixed: syndication urls for WAR deployments - fixed: authentication for zip downloads +

+ **0.5.2** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.2.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.2.war)) based on [JGit 1.0.0 (201106090707-r)][jgit] *released 2011-07-27* - fixed: active repositories with a HEAD that pointed to an empty branch caused internal errors (issue 14) @@ -169,12 +186,16 @@ This change helps adoption of GO in environments without an internet connection - updated: MarkdownPapers 1.1.0 - updated: Jetty 7.4.3 +

+ **0.5.1** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.1.war)) based on [JGit 1.0.0 (201106090707-r)][jgit] *released 2011-06-28* - clarified SSL certificate generation and configuration for both server-side and client-side - added some more troubleshooting information to documentation - replaced JavaService with Apache Commons Daemon +

+ **0.5.0** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.0.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.5.0.war)) based on [JGit 1.0.0 (201106090707-r)][jgit] *released 2011-06-26* - initial release diff --git a/docs/doc_footer.html b/docs/doc_footer.html index ab2d7ee8..577380ea 100644 --- a/docs/doc_footer.html +++ b/docs/doc_footer.html @@ -1,9 +1,8 @@ - -

-

{0}

- The content of this page is licensed under the Creative Commons Attribution 3.0 License. -

- + + \ No newline at end of file diff --git a/docs/doc_header.html b/docs/doc_header.html index 7d4d4c1d..c5ba366b 100644 --- a/docs/doc_header.html +++ b/docs/doc_header.html @@ -2,36 +2,23 @@ Gitblit - - - + + - - - - - - - - - + + + - -

code	name	description
200	success	Gitblit processed the request successfully
401	unauthorized	Gitblit requires user credentials to process the request

a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="

"+""+"

",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="

t

",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="

",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; +f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="

";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"

","

"],thead:[1,"","

"],tr:[2,"","

"],td:[3,"","

"],col:[2,"","

"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div

","

"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() +{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("

").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/resources/gitblit.css b/resources/gitblit.css new file mode 100644 index 00000000..e3f2bb5e --- /dev/null +++ b/resources/gitblit.css @@ -0,0 +1,888 @@ +body { + /* 50px to start the container 10px below the navbar */ + padding-top: 50px; +} + +footer { + margin-top: 25px; + padding: 15px 0 16px; + border-top: 1px solid #E5E5E5; +} + +body, input, select { + color: #202020; +} + +ul, ol { + margin-bottom: 10px !important; +} + +hr { + margin-top: 10px; + margin-bottom: 10px; +} + +.settings h3 { + margin-bottom: 0.5em; + border-bottom: 1px solid #000080 !important; +} + +.pageTitle { + padding-bottom: 5px; + margin: 0; + border-bottom: 1px solid #eee; +} + +.pageTitle h1, .pageTitle h2 { + color: #0069D6; +} + +.navbar { + height:40px !important; +} + +.navbar ul.nav li a { + color: white; + text-shadow: none; + outline: 0; +} + +.navbar ul.nav li a:hover { + color: #abd4ff !important; +} + +.navbar-inner { + height:40px !important; + background-color:#000050; + background-repeat:repeat-x; + background-image:-khtml-gradient(linear, left top, left bottom, from(#000060), to(#000040)); + background-image:-moz-linear-gradient(top, #000060, #000040); + background-image:-ms-linear-gradient(top, #000060, #000040); + background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #000060), color-stop(100%, #000040)); + background-image:-webkit-linear-gradient(top, #000060, #000040); + background-image:-o-linear-gradient(top, #000060, #000040); + background-image:linear-gradient(top, #000060, #000040); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000060', endColorstr='#000040', GradientType=0); + -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1); + -moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1); + box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1); + border-bottom: 2px solid #ff9900 !important; +} + +.navbar ul li:focus, .navbar .active { + background-repeat:no-repeat; + background-image: url(arrow_page.png); + background-position: center bottom; + outline: 0; +} + +.navbar .active a { + background-color: transparent !important; + outline: 0; +} + +.navbar div > ul .menu-dropdown .selected, .nav .menu-dropdown .selected, .navbar div > ul .dropdown-menu .selected, .nav .dropdown-menu .selected { + background-image: url("bullet_blue.png"); + background-repeat: no-repeat; + background-position: left; +} + +.navbar div>ul .dropdown-menu li a { + color: #555; +} + +navbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.navbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{ + background-color: #000070; + color: #ffffff !important; +} + +.breadcrumb { + margin-top: 5px !important; + margin-bottom: 5px !important; +} + +.pageTitle { + margin-bottom: 5px; +} + +.pageTitle h2 small { + font-size: 80%; + font-weight: bold; +} + +div.page_footer { + clear: both; + height: 17px; + color: black; + background-color: #ffffff; + padding: 5px; + border-top: 1px solid #bbb; + font-style: italic; +} + +pre, code, pre.prettyprint, pre.plainprint { + background-color: #ffffff; + color: black; + font-family: monospace; + font-size:12px; + border:0px; + padding: 0; + line-height: 1.35em; +} + +table { + margin-bottom:5px !important; + font-size: inherit; +} + +.table th { + vertical-align: top; +} + +th { + vertical-align: middle; + text-align: left; +} + +pre.prettyprint ol { + padding-left:25px; +} + +h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { + color: #888; +} + +.age0, .age1, .age2 { + font-size: 12px; +} + +/* age0: age < 60*60*2 */ +.age0 { + color: #008000; + font-style: italic; + font-weight: bold; +} + +/* age1: 60*60*2 <= age < 60*60*24*2 */ +.age1 { + color: #008000; + font-style: italic; +} + +/* age2: 60*60*24*2 <= age */ +.age2 { + font-style: italic; +} + +a.list { + text-decoration: none; + color: inherit; +} + +a.list.subject { + font-weight: bold; +} + +a.list.name { + font-weight: bold; +} + +a.list:hover { + text-decoration: underline; + color: #880000; +} + +span.empty { + font-size: 0.9em; + font-style: italic; + padding-left:10px; + color: #008000; +} + +span.link { + color: #888; +} + +span.link, span.link a { + font-family: sans-serif; + font-size: 11px; +} + +span.link em, div.link span em { + font-style: normal; + font-family: sans-serif; + font-size: 11px; +} + +span.repositorySwatch { + border-radius: 3px; + padding: 1px 4px 2px 4px; + color: #ffffff; + font-weight: bold; + vertical-align: center; +} +span.repositorySwatch a { + color: inherit; +} + +img.inlineIcon { + padding-left: 1px; + padding-right: 1px; +} + +img.overview { + float:right; + border:1px solid #CCCCCC; +} + +img.gravatar { + background-color: #ffffff; + border: 1px solid #ddd; + border-radius: 5px; + padding: 2px; +} + +div.header, div.commitHeader, table.repositories th { + background-color:#e0e0e0; + background-repeat:repeat-x; + background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#e0e0e0)); + background-image:-moz-linear-gradient(top, #ffffff, #e0e0e0); + background-image:-ms-linear-gradient(top, #ffffff, #e0e0e0); + background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e0e0e0)); + background-image:-webkit-linear-gradient(top, #ffffff, #e0e0e0); + background-image:-o-linear-gradient(top, #ffffff, #e0e0e0); + background-image:linear-gradient(top, #ffffff, #e0e0e0); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e0e0e0', GradientType=0); + -webkit-box-shadow:inset 0 1px 0 #ffffff; + -moz-box-shadow:inset 0 1px 0 #ffffff; + box-shadow:inset 0 1px 0 #ffffff; +} + +div.header { + padding: 3px; + border: 1px solid #ddd; + border-bottom: 0; + border-radius: 3px 3px 0 0; +} + +div.commitHeader { + margin:0 0 2px; + padding:7px 14px; + border:1px solid #ddd; + border-radius: 3px; + -webkit-border-radius:3px; + -moz-border-radius:3px;border-radius:3px; +} + +div.header a, div.commitHeader a { + color: black; + text-decoration: none; + font-weight: bold; +} + +div.header a:hover, div.commitHeader a:hover { + text-decoration: underline; +} + +div.page_nav2 { + padding: 2px 5px 7px 5px; +} + +div.admin_nav { + border-bottom: 0px; + text-align: right; + padding: 5px 5px 5px 2px; +} + +div.admin_nav a { + text-decoration: none; +} + +div.admin_nav a:hover { + text-decoration: underline; +} + +span.search { + height: 40px; + padding-top:2px; +} + +span.search input { + -webkit-border-radius:0;-moz-border-radius:0x;border-radius:0; + vertical-align: top; + background: url(search-icon.png) no-repeat 4px center; + background-color: transparent; + border: 1px solid transparent; + outline: none; + padding: 2px 2px 2px 22px; + text-shadow: none; + margin: 0px; + + color: #ddd; +} + +span.search input:hover, span.search input:focus { + background-color: transparent; + border: 1px solid transparent; + padding: 2px 2px 2px 22px; + box-shadow: none; + color: #ddd; + border-bottom: 1px solid #ff9900; +} + +span.search input:focus { + color: white; +} + +/* div.search input:focused { */ +/* background-color: transparent; */ +/* border: 1px solid transparent; */ +/* padding: 2px 2px 2px 22px; */ +/* text-shadow: none; */ +/* } */ + +span.login input:focus { + background-color: rgba(255, 255, 255, 0.6); + text-shadow: none; + color: white; +} + +pre.commit_message { + padding: 8px; + border: solid #ddd; + border-width: 1px 0px 0px; +} + +div.bug_open, span.bug_open { + padding: 2px; + background-color: #803333; + color: white; + text-align: center; +} + +div.bug_resolved, span.bug_resolved { + padding: 2px; + background-color: #408040; + color: white; + text-align: center; +} + +div.bug_invalid, span.bug_invalid { + padding: 2px; + background-color: gray; + text-align: center; +} + +div.bug_hold, span.bug_hold { + padding: 2px; + background-color: orange; + text-align: center; +} + +div.diff { + font-family: monospace; + overflow: auto; +} + +div.diff.header { + -moz-border-bottom-colors: none; + -moz-border-image: none; + -moz-border-left-colors: none; + -moz-border-right-colors: none; + -moz-border-top-colors: none; + background-color: #EDECE6; + border-color: #D9D8D1; + border-style: solid; + border-width: 1px; + font-weight: bold; + margin-top: 10px; + padding: 4px 0 2px; +} + +div.diff.extended_header { + background-color: #F6F5EE; + padding: 2px 0; + font-family: inherit; +} + +span.diff.add { + color: #008800; + font-family: inherit; +} + +span.diff.remove { + color: #FFDDDD; + font-family: inherit; +} + +span.diff.unchanged { + color: inherit; + font-family: inherit; +} + +div.diff.hunk_header { + -moz-border-bottom-colors: none; + -moz-border-image: none; + -moz-border-left-colors: none; + -moz-border-right-colors: none; + -moz-border-top-colors: none; + border-color: #FFE0FF; + border-style: dotted; + border-width: 1px 0 0; + margin-top: 2px; + font-family: inherit; +} + +span.diff.hunk_info { + background-color: #FFEEFF; + color: #990099; + font-family: inherit; +} + +span.diff.hunk_section { + color: #AA22AA; + font-family: inherit; +} + +div.diff.add2 { + background-color: #DDFFDD; + font-family: inherit; +} + +div.diff.remove2 { + background-color: #FFDDDD; + font-family: inherit; +} + +div.diff table { + border-radius: 0; + border-right: 1px solid #bbb; + border-bottom: 1px solid #bbb; + width: 100%; +} + +div.diff table th, div.diff table td { + margin: 0px; + padding: 0px; + font-family: monospace; + border: 0; +} + +div.diff table th { + background-color: #f0f0f0; + text-align: center; + color: #999; + padding-left: 5px; + padding-right: 5px; + width: 30px; +} + +div.diff table th.header { + background-color: #D2C3AF; + border-right: 0px; + border-bottom: 1px solid #808080; + font-family: inherit; + font-size:0.9em; + color: black; + padding: 2px; + text-align: left; +} + +div.diff table td.hunk_header { + background-color: #dAe2e5 !important; + border-top: 1px solid #bac2c5; + border-bottom: 1px solid #bac2c5; + color: #555; +} + +div.diff table td { + border-left: 1px solid #bbb; + background-color: #f5f5f5; +} + +td.changeType { + width: 15px; +} + +span.addition, span.modification, span.deletion, span.rename { + border: 1px solid #888; + float: left; + height: 0.8em; + margin: 0.2em 0.5em 0 0; + overflow: hidden; + width: 0.8em; +} + +span.addition { + background-color: #ccffcc; +} + +span.modification { + background-color: #ffdd88; +} + +span.deletion { + background-color: #f8bbbb; +} + +span.rename { + background-color: #cAc2f5; +} + +div.commitLegend { + float: right; + padding: 0.4em 0.4em 0.2em 0.4em; + vertical-align:top; + margin: 0px; +} + +div.commitLegend span { + font-size: 0.9em; + vertical-align: top; +} + +div.references { + float: right; + text-align: right; +} + +table.plain { + width: 0 !important; + border: 0; +} + +table.plain th, table.plain td { + white-space: nowrap; + padding: 1px 6px; + border: 0; +} + +table.pretty { + border:1px solid #ddd; + border-radius: 0 0 3px 3px; + width: 100%; +} + +table.pretty td.icon { + padding: 0px 0px 0px 2px; + width: 18px; + vertical-align: middle; +} + +table.pretty td.icon img { + vertical-align: top; +} + +table.pretty td { + padding: 2px 4px; + border-left: 0; +} + +table.comments td { + padding: 4px; + line-height: 17px; +} + +table.repositories { + border:1px solid #ddd; + border-spacing: 0px; + width: 100%; +} + +table.repositories th { + padding: 4px; + border:0; +} + +table.repositories td { + padding: 2px; + border-left: 0; +} + +table.repositories td.rightAlign { + text-align: right; +} + +table.repositories td.icon img { + vertical-align: top; +} + +table.repositories tr.group { + background-color: #ccc; +} + +table.repositories tr.group td { + font-weight: bold; + color: black; + background-color: #ddd; + padding-left: 5px; + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; +} + +table.palette { border:0; width: 0 !important; } +table.palette td.header { + font-weight: bold; + background-color: #ffffff !important; + padding-top: 0px !important; + margin-bottom: 0 !imporant; + border: 0 !important; + border-radius: 0 !important; + line-height: 1em; +} +table.palette td.pane { + padding: 0px; +} + +table.gitnotes { + border: 0; +} +table.gitnotes td { + border-top: 1px solid #ddd; + padding-top: 3px; + vertical-align:top; +} + +table.gitnotes table { + border: none; +} + +table.gitnotes td table td { + border: none; + padding: 0px; +} + +table.gitnotes td.info { + padding-right: 10px; +} + +table.gitnotes td.message { + width: 65%; + border-left: 1px solid #ddd; + padding-left: 10px; +} + +table.annotated { + border:1px solid #ddd; +} + +table.annotated tr.even { + background-color: white; +} + +table.annotated tr.odd { + background-color: #f5f5f5; +} + +table.annotated td { + padding: 0px; + border: 0; +} + +table.activity { + width: 100%; +} + +tr th a { background-position: right; padding-right: 15px; background-repeat:no-repeat; } +tr th.wicket_orderDown a {background-image: url(arrow_down.png); } +tr th.wicket_orderUp a { background-image: url(arrow_up.png); } +tr th.wicket_orderNone a { background-image: url(arrow_off.png); } + +tr.light { + background-color: #ffffff; +} + +tr.dark { + background-color: #f5f5f5; +} + +/* currently both use the same, but it can change */ +tr.light:hover, +tr.dark:hover { + background-color: #000070; + color: white; +} + +tr.light:hover a, +tr.dark:hover a { + color: white; +} + +td.author { + font-style: italic !important; +} + +td.date { + font-style: italic !important; +} + +span.sha1, span.sha1 a, span.sha1 a span, pre.commit_message { + font-family: monospace; + font-size: 13px; +} + +td.mode { + text-align: right; + font-family: monospace; + width: 8em; + padding-right:15px; +} + +td.size { + text-align: right; + width: 8em; + padding-right:15px; +} + +td.rightAlign { + text-align: right; +} + +td.treeLinks { + text-align: right; + width: 13em; +} + +span.help-inline { + color: #777; +} + +span.metricsTitle { + font-size: 2em; +} + +span .tagRef, span .headRef, span .localBranch, span .remoteBranch, span .otherRef { + padding: 0px 3px; + margin-right:2px; + font-family: sans-serif; + font-size: 9px; + font-weight: normal; + border: 1px solid; + color: black; +} + +span .tagRef a span, span .headRef a span, span .localBranch a span, span .remoteBranch a span, span .otherRef a span { + font-size: 9px; +} + +span .tagRef a, span .headRef a, span .localBranch a, span .remoteBranch a, span .otherRef a { + text-decoration: none; + color: black !important; +} + +span .tagRef a:hover, span .headRef a:hover, span .localBranch a:hover, span .remoteBranch a:hover, span .otherRef a:hover { + color: black !important; + text-decoration: underline; +} + +span .otherRef { + background-color: #b0e0f0; + border-color: #80aaaa; +} + +span .remoteBranch { + background-color: #cAc2f5; + border-color: #6c6cbf; +} + +span .tagRef { + background-color: #ffffaa; + border-color: #ffcc00; +} + +span .headRef { + background-color: #ffaaff; + border-color: #ff00ee; +} + +span .localBranch { + background-color: #ccffcc; + border-color: #00cc33; +} + +table .palette td.buttons button { + -webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px; + border: 1px solid #ccc !important; + padding: 10px; + margin-bottom: 10px; +} + +table .palette td.buttons button:hover { + border: 1px solid #0069D6 !important; +} + +table .palette td.buttons button:active { + border: 1px solid orange !important; +} + +.feedbackPanelERROR, .feedbackPanelINFO { + list-style: none; + line-height: 35px; +} + +.feedbackPanelINFO span, .feedbackPanelERROR span { + position:relative;padding:7px 15px;margin-top:5px;margin-bottom:5px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25); +} + +.feedbackPanelERROR span { + color: #ffffff; + background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} + +/* google-code-prettify line numbers */ +li.L0, +li.L1, +li.L2, +li.L3, +li.L4, +li.L5, +li.L6, +li.L7, +li.L8, +li.L9 { color: #888; border-left: 1px solid #ccc; padding-left:5px; list-style-type: decimal !important; } + +/* Alternate shading for lines */ +li.L1, +li.L3, +li.L5, +li.L7, +li.L9 { background: #fafafa !important; } + +div.markdown pre { + background-color: #F5F5F5; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 4px 4px 4px 4px; + display: block; + font-size: 12px; + line-height: 18px; + margin: 0 0 9px; + padding: 8.5px; + white-space: pre-wrap; +} + +div.markdown pre code { + background-color: inherit; + border: none; + padding: 0; +} + +div.markdown code { + background-color: #ffffe0; + border: 1px solid orange; + border-radius: 3px; + padding: 0 0.2em; +} + +div.markdown a { + text-decoration: underline; +} + +div.markdown em { + color: #b05000; +} + +div.markdown table.text th, div.markdown table.text td { + vertical-align: top; + border-top: 1px solid #ccc; + padding:5px; +} \ No newline at end of file diff --git a/resources/markdown.css b/resources/markdown.css deleted file mode 100644 index e0bfe386..00000000 --- a/resources/markdown.css +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Git:Blit Markdown CSS definition. - */ - -div.markdown { - line-height: 1.4em; - color: black; -} - -div.markdown li { - color: black; -} - -div.markdown h1, -div.markdown h2, -div.markdown h3, -div.markdown h4, -div.markdown h5, -div.markdown h6 { - border: 0 none !important; -} - -div.markdown h1 { - margin-top: 0.5em; - margin-bottom: 0.5em; - border-bottom: 2px solid #000080 !important; -} - -div.markdown h2 { - margin-top: 1em; - margin-bottom: 0.5em; - border-bottom: 2px solid #000080 !important; -} - -div.markdown pre { - background-color: #f8f8f8; - border: 1px solid #2f6fab; - border-radius: 3px; - overflow: auto; - padding: 5px; -} - -div.markdown pre code { - background-color: inherit; - border: none; - padding: 0; -} - -div.markdown code { - background-color: #ffffe0; - border: 1px solid orange; - border-radius: 3px; - padding: 0 0.2em; -} - -div.markdown a { - text-decoration: underline; -} - -div.markdown ul, div.markdown ol { - padding-left: 30px; -} - -div.markdown li { - margin: 0.2em 0 0 0em; padding: 0px; -} - -div.markdown em { - color: #b05000; -} - -div.markdown table.text th, div.markdown table.text td { - vertical-align: top; - border-top: 1px solid #ccc; - padding:5px; -} \ No newline at end of file diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index b5cd5150..b4501c33 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -211,5 +211,5 @@ gb.federationRepositoryDescription = share this repository with other Gitblit se gb.hookScriptsDescription = run Groovy scripts on pushes to this Gitblit server gb.reset = reset gb.pages = pages -gb.workingCopy = WORKING COPY +gb.workingCopy = working copy gb.workingCopyWarning = this repository has a working copy and can not receive pushes \ No newline at end of file diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java index fb05d3ff..8c1cf3c8 100644 --- a/src/com/gitblit/wicket/WicketUtils.java +++ b/src/com/gitblit/wicket/WicketUtils.java @@ -95,11 +95,11 @@ public class WicketUtils { public static void setTicketCssClass(Component container, String state) { String css = null; if (state.equals("open")) { - css = "label important"; + css = "label label-important"; } else if (state.equals("hold")) { - css = "label warning"; + css = "label label-warning"; } else if (state.equals("resolved")) { - css = "label success"; + css = "label label-success"; } else if (state.equals("invalid")) { css = "label"; } diff --git a/src/com/gitblit/wicket/pages/ActivityPage.html b/src/com/gitblit/wicket/pages/ActivityPage.html index dff5db27..1a877833 100644 --- a/src/com/gitblit/wicket/pages/ActivityPage.html +++ b/src/com/gitblit/wicket/pages/ActivityPage.html @@ -5,7 +5,7 @@ lang="en"> -

+

/ [days back]

diff --git a/src/com/gitblit/wicket/pages/ActivityPage.java b/src/com/gitblit/wicket/pages/ActivityPage.java index aa2f2665..634b2985 100644 --- a/src/com/gitblit/wicket/pages/ActivityPage.java +++ b/src/com/gitblit/wicket/pages/ActivityPage.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.wicket.Application; import org.apache.wicket.PageParameters; import org.apache.wicket.behavior.HeaderContributor; import org.apache.wicket.markup.html.basic.Label; @@ -203,22 +202,4 @@ public class ActivityPage extends RootPage { return charts; } - - @Override - protected void onBeforeRender() { - if (GitBlit.isDebugMode()) { - // strip Wicket tags in debug mode for jQuery DOM traversal - Application.get().getMarkupSettings().setStripWicketTags(true); - } - super.onBeforeRender(); - } - - @Override - protected void onAfterRender() { - if (GitBlit.isDebugMode()) { - // restore Wicket debug tags - Application.get().getMarkupSettings().setStripWicketTags(false); - } - super.onAfterRender(); - } } diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html index 9983e300..6eefa170 100644 --- a/src/com/gitblit/wicket/pages/BasePage.html +++ b/src/com/gitblit/wicket/pages/BasePage.html @@ -6,30 +6,35 @@ + [page title] - - + + + + + + + - -

-

+ -

-

-

[user panel]

-

-

+

+

+ diff --git a/src/com/gitblit/wicket/pages/BasePage.java b/src/com/gitblit/wicket/pages/BasePage.java index ca940071..515e9ce1 100644 --- a/src/com/gitblit/wicket/pages/BasePage.java +++ b/src/com/gitblit/wicket/pages/BasePage.java @@ -22,6 +22,7 @@ import java.util.TimeZone; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; +import org.apache.wicket.Application; import org.apache.wicket.MarkupContainer; import org.apache.wicket.PageParameters; import org.apache.wicket.RestartResponseAtInterceptPageException; @@ -64,6 +65,24 @@ public abstract class BasePage extends WebPage { logger = LoggerFactory.getLogger(getClass()); loginByCookie(); } + + @Override + protected void onBeforeRender() { + if (GitBlit.isDebugMode()) { + // strip Wicket tags in debug mode for jQuery DOM traversal + Application.get().getMarkupSettings().setStripWicketTags(true); + } + super.onBeforeRender(); + } + + @Override + protected void onAfterRender() { + if (GitBlit.isDebugMode()) { + // restore Wicket debug tags + Application.get().getMarkupSettings().setStripWicketTags(false); + } + super.onAfterRender(); + } private void loginByCookie() { if (!GitBlit.getBoolean(Keys.web.allowCookieAuthentication, false)) { diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.html b/src/com/gitblit/wicket/pages/ChangePasswordPage.html index e72ef1ed..36439a91 100644 --- a/src/com/gitblit/wicket/pages/ChangePasswordPage.html +++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.html @@ -19,8 +19,10 @@

- - +

+ + +

diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.html b/src/com/gitblit/wicket/pages/CommitDiffPage.html index 8f238a7a..f2960bfa 100644 --- a/src/com/gitblit/wicket/pages/CommitDiffPage.html +++ b/src/com/gitblit/wicket/pages/CommitDiffPage.html @@ -16,12 +16,13 @@

[commit header]

-

+

+ @@ -35,7 +36,7 @@

[change type]

-

[diff text]

+

[diff text]

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html index 124c82fb..2a1ae70c 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html @@ -11,30 +11,30 @@ - - - + + + - - - - - - - - + + + + + + + + - + - + - + diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.html b/src/com/gitblit/wicket/pages/EditTeamPage.html index 0e613527..5a2edaee 100644 --- a/src/com/gitblit/wicket/pages/EditTeamPage.html +++ b/src/com/gitblit/wicket/pages/EditTeamPage.html @@ -12,7 +12,7 @@

- +

@@ -20,7 +20,7 @@

-

+

diff --git a/src/com/gitblit/wicket/pages/EditUserPage.html b/src/com/gitblit/wicket/pages/EditUserPage.html index 94077c03..9e30d9a8 100644 --- a/src/com/gitblit/wicket/pages/EditUserPage.html +++ b/src/com/gitblit/wicket/pages/EditUserPage.html @@ -14,13 +14,13 @@ - - + +

-

+

diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.html b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.html index cc5ba85a..951a2d3f 100644 --- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.html +++ b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.html @@ -12,7 +12,7 @@ -

+

Empty Repository

[repository] is an empty repository and can not be viewed by Gitblit. diff --git a/src/com/gitblit/wicket/pages/GravatarProfilePage.html b/src/com/gitblit/wicket/pages/GravatarProfilePage.html index 1719d908..2a83de73 100644 --- a/src/com/gitblit/wicket/pages/GravatarProfilePage.html +++ b/src/com/gitblit/wicket/pages/GravatarProfilePage.html @@ -5,7 +5,7 @@ lang="en"> -

+

Gravatar / [username]

diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.html b/src/com/gitblit/wicket/pages/MarkdownPage.html index 1293f786..7900625b 100644 --- a/src/com/gitblit/wicket/pages/MarkdownPage.html +++ b/src/com/gitblit/wicket/pages/MarkdownPage.html @@ -3,11 +3,6 @@ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" xml:lang="en" lang="en"> - - - - - diff --git a/src/com/gitblit/wicket/pages/MetricsPage.html b/src/com/gitblit/wicket/pages/MetricsPage.html index cff5817d..4aefc798 100644 --- a/src/com/gitblit/wicket/pages/MetricsPage.html +++ b/src/com/gitblit/wicket/pages/MetricsPage.html @@ -10,7 +10,7 @@

- +

- +

diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.html b/src/com/gitblit/wicket/pages/RepositoriesPage.html index c883099c..d2d27157 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.html +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.html @@ -3,13 +3,10 @@ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" xml:lang="en" lang="en"> - - - - [repositories message] + [repositories message] [repositories panel] diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index f679c760..07f7ad4c 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -22,7 +22,6 @@ import java.io.InputStreamReader; import java.text.MessageFormat; import java.util.List; -import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; @@ -148,22 +147,4 @@ public class RepositoriesPage extends RootPage { } return message; } - - @Override - protected void onBeforeRender() { - if (GitBlit.isDebugMode()) { - // strip Wicket tags in debug mode for jQuery DOM traversal - Application.get().getMarkupSettings().setStripWicketTags(true); - } - super.onBeforeRender(); - } - - @Override - protected void onAfterRender() { - if (GitBlit.isDebugMode()) { - // restore Wicket debug tags - Application.get().getMarkupSettings().setStripWicketTags(false); - } - super.onAfterRender(); - } } diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index d69c7f90..169d4f08 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -6,46 +6,55 @@ - - - - - - - - - + + + + + + + + + + + + - + - - - + + + - - - - - + + + + + - - - [Feedback Panel] - - - - - [working copy] + + + + [Feedback Panel] + + + + + + + [repository name] [page name] - [repository name] [page name] + + - - - + + + [working copy] + + \ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index 77918ea4..080a7723 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -156,9 +156,11 @@ public abstract class RepositoryPage extends BasePage { if (getRepositoryModel().isBare) { add(new Label("workingCopy").setVisible(false)); } else { + Fragment fragment = new Fragment("workingCopy", "workingCopyFragment", this); Label lbl = new Label("workingCopy", getString("gb.workingCopy")); WicketUtils.setHtmlTooltip(lbl, getString("gb.workingCopyWarning")); - add(lbl); + fragment.add(lbl); + add(fragment); } super.setupPage(repositoryName, pageName); diff --git a/src/com/gitblit/wicket/pages/RootPage.html b/src/com/gitblit/wicket/pages/RootPage.html index a4dcb2c1..f1bc4def 100644 --- a/src/com/gitblit/wicket/pages/RootPage.html +++ b/src/com/gitblit/wicket/pages/RootPage.html @@ -5,21 +5,26 @@ lang="en"> - - + + + + + + + - + - - + + - - + + @@ -28,7 +33,9 @@ [Feedback Panel] - + + + \ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/RootSubPage.html b/src/com/gitblit/wicket/pages/RootSubPage.html index 554da111..2b109f9b 100644 --- a/src/com/gitblit/wicket/pages/RootSubPage.html +++ b/src/com/gitblit/wicket/pages/RootSubPage.html @@ -7,7 +7,7 @@ - + [page name] [sub name] diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.html b/src/com/gitblit/wicket/pages/SendProposalPage.html index 75bcd3d5..cb9f3539 100644 --- a/src/com/gitblit/wicket/pages/SendProposalPage.html +++ b/src/com/gitblit/wicket/pages/SendProposalPage.html @@ -14,7 +14,7 @@
message
type	[token type]
token	[token]

diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/com/gitblit/wicket/pages/SummaryPage.html index 132b8918..941e777d 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.html +++ b/src/com/gitblit/wicket/pages/SummaryPage.html @@ -3,11 +3,6 @@ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd" xml:lang="en" lang="en"> - - - - - @@ -39,7 +34,17 @@

[branches panel]

-

+

+ + + +

+

+

+ \ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java index 627fc5d8..acb41808 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/com/gitblit/wicket/pages/SummaryPage.java @@ -22,9 +22,11 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.List; +import org.apache.wicket.Component; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.markup.html.panel.Fragment; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.wicketstuff.googlecharts.Chart; @@ -135,11 +137,11 @@ public class SummaryPage extends RepositoryPage { if (getRepositoryModel().showReadme) { String htmlText = null; + String readme = null; try { RevCommit head = JGitUtils.getCommit(r, null); List markdownExtensions = GitBlit.getStrings(Keys.web.markdownExtensions); - List paths = JGitUtils.getFilesInPath(r, null, head); - String readme = null; + List paths = JGitUtils.getFilesInPath(r, null, head); for (PathModel path : paths) { if (!path.isTree()) { String name = path.name.toLowerCase(); @@ -162,9 +164,12 @@ public class SummaryPage extends RepositoryPage { } catch (ParseException p) { error(p.getMessage()); } + Fragment fragment = new Fragment("readme", "markdownPanel"); + fragment.add(new Label("readmeFile", readme)); // Add the html to the page - add(new Label("readme", htmlText).setEscapeModelStrings(false).setVisible( - !StringUtils.isEmpty(htmlText))); + Component content = new Label("readmeContent", htmlText).setEscapeModelStrings(false); + fragment.add(content.setVisible(!StringUtils.isEmpty(htmlText))); + add(fragment); } else { add(new Label("readme").setVisible(false)); } diff --git a/src/com/gitblit/wicket/pages/TicketPage.java b/src/com/gitblit/wicket/pages/TicketPage.java index d250a452..48db1cea 100644 --- a/src/com/gitblit/wicket/pages/TicketPage.java +++ b/src/com/gitblit/wicket/pages/TicketPage.java @@ -34,7 +34,7 @@ public class TicketPage extends RepositoryPage { public TicketPage(PageParameters params) { super(params); - final String ticketFolder = WicketUtils.getObject(params); + final String ticketFolder = WicketUtils.getPath(params); Repository r = getRepository(); TicketModel t = TicgitUtils.getTicket(r, ticketFolder); diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.html b/src/com/gitblit/wicket/panels/ActivityPanel.html index 90e808ff..f125f113 100644 --- a/src/com/gitblit/wicket/panels/ActivityPanel.html +++ b/src/com/gitblit/wicket/panels/ActivityPanel.html @@ -9,7 +9,7 @@

- +

diff --git a/src/com/gitblit/wicket/panels/DropDownMenu.html b/src/com/gitblit/wicket/panels/DropDownMenu.html index 5898906b..0a8319ec 100644 --- a/src/com/gitblit/wicket/panels/DropDownMenu.html +++ b/src/com/gitblit/wicket/panels/DropDownMenu.html @@ -4,31 +4,9 @@ xml:lang="en" lang="en"> - - - - - - -

-[link] +[link]

(label), clazz, null, false); + this(wicketId, null, linkCssClass, new Model(label), clazz, null, false); } public LinkPanel(String wicketId, String linkCssClass, String label, Class clazz, PageParameters parameters) { - this(wicketId, linkCssClass, new Model(label), clazz, parameters, false); + this(wicketId, null, linkCssClass, new Model(label), clazz, parameters, false); } public LinkPanel(String wicketId, String linkCssClass, String label, Class clazz, PageParameters parameters, boolean newWindow) { - this(wicketId, linkCssClass, new Model(label), clazz, parameters, newWindow); + this(wicketId, null, linkCssClass, new Model(label), clazz, parameters, newWindow); + } + + public LinkPanel(String wicketId, String bootstrapIcon, String linkCssClass, String label, + Class clazz, PageParameters parameters, boolean newWindow) { + this(wicketId, bootstrapIcon, linkCssClass, new Model(label), clazz, parameters, newWindow); } public LinkPanel(String wicketId, String linkCssClass, IModel model, Class clazz, PageParameters parameters) { - this(wicketId, linkCssClass, model, clazz, parameters, false); + this(wicketId, null, linkCssClass, model, clazz, parameters, false); } - public LinkPanel(String wicketId, String linkCssClass, IModel model, + public LinkPanel(String wicketId, String bootstrapIcon, String linkCssClass, IModel model, Class clazz, PageParameters parameters, boolean newWindow) { super(wicketId); this.labelModel = model; @@ -68,6 +76,13 @@ public class LinkPanel extends Panel { if (linkCssClass != null) { link.add(new SimpleAttributeModifier("class", linkCssClass)); } + Label icon = new Label("icon"); + if (StringUtils.isEmpty(bootstrapIcon)) { + link.add(icon.setVisible(false)); + } else { + WicketUtils.setCssClass(icon, bootstrapIcon); + link.add(icon); + } link.add(new Label("label", labelModel)); add(link); } @@ -87,6 +102,7 @@ public class LinkPanel extends Panel { if (linkCssClass != null) { link.add(new SimpleAttributeModifier("class", linkCssClass)); } + link.add(new Label("icon").setVisible(false)); link.add(new Label("label", labelModel)); add(link); } diff --git a/src/com/gitblit/wicket/panels/NavigationPanel.java b/src/com/gitblit/wicket/panels/NavigationPanel.java index 57c82e80..558cc716 100644 --- a/src/com/gitblit/wicket/panels/NavigationPanel.java +++ b/src/com/gitblit/wicket/panels/NavigationPanel.java @@ -48,17 +48,20 @@ public class NavigationPanel extends Panel { // other link OtherPageLink link = (OtherPageLink) entry; Component c = new LinkPanel("link", null, getString(entry.translationKey), link.url); + c.setRenderBodyOnly(true); item.add(c); } else if (entry instanceof DropDownMenuRegistration) { // drop down menu DropDownMenuRegistration reg = (DropDownMenuRegistration) entry; Component c = new DropDownMenu("link", getString(entry.translationKey), reg); + c.setRenderBodyOnly(true); item.add(c); - WicketUtils.setCssClass(item, "menu"); + WicketUtils.setCssClass(item, "dropdown"); } else { // standard page link Component c = new LinkPanel("link", null, getString(entry.translationKey), entry.pageClass, entry.params); + c.setRenderBodyOnly(true); if (entry.pageClass.equals(pageClass)) { WicketUtils.setCssClass(item, "active"); }