bce1128c4a2… — Fossil SCM

M src/login.c

+1 -1

		--- src/login.c
		+++ src/login.c
		@@ -599,11 +599,11 @@
599	599	@ <td></td>
600	600	@ <td><input type="submit" name="in" value="Login"
601	601	@ onClick="chngAction(this.form)" /></td>
602	602	@ </tr>
603	603	@ </table>
604		- @ <script type="text/JavaScript">
	604	+ @ <script>
605	605	@ gebi('u').focus()
606	606	@ function chngAction(form){
607	607	if( g.sslNotAvailable==0
608	608	&& strncmp(g.zBaseURL,"https:",6)!=0
609	609	&& db_get_boolean("https-login",0)
610	610

	--- src/login.c
	+++ src/login.c
	@@ -599,11 +599,11 @@
599	@ <td></td>
600	@ <td><input type="submit" name="in" value="Login"
601	@ onClick="chngAction(this.form)" /></td>
602	@ </tr>
603	@ </table>
604	@ <script type="text/JavaScript">
605	@ gebi('u').focus()
606	@ function chngAction(form){
607	if( g.sslNotAvailable==0
608	&& strncmp(g.zBaseURL,"https:",6)!=0
609	&& db_get_boolean("https-login",0)
610

	--- src/login.c
	+++ src/login.c
	@@ -599,11 +599,11 @@
599	@ <td></td>
600	@ <td><input type="submit" name="in" value="Login"
601	@ onClick="chngAction(this.form)" /></td>
602	@ </tr>
603	@ </table>
604	@ <script>
605	@ gebi('u').focus()
606	@ function chngAction(form){
607	if( g.sslNotAvailable==0
608	&& strncmp(g.zBaseURL,"https:",6)!=0
609	&& db_get_boolean("https-login",0)
610

M src/style.c

+1 -3

		--- src/style.c
		+++ src/style.c
		@@ -163,12 +163,11 @@
163	163	void style_resolve_href(void){
164	164	int i;
165	165	int nDelay = db_get_int("auto-hyperlink-delay",10);
166	166	if( !g.perm.Hyperlink ) return;
167	167	if( nHref==0 && nFormAction==0 ) return;
168		- @ <script type="text/JavaScript">
169		- @ /* <![CDATA[ */
	168	+ @ <script>
170	169	@ function setAllHrefs(){
171	170	if( g.javascriptHyperlink ){
172	171	for(i=0; i<nHref; i++){
173	172	@ gebi("a%d(i+1)").href="%s(aHref[i])";
174	173	}
		@@ -192,11 +191,10 @@
192	191	@ }
193	192	}else{
194	193	/* Active hyperlinks right away */
195	194	@ setTimeout("setAllHrefs();",%d(nDelay));
196	195	}
197		- @ /* ]]> */
198	196	@ </script>
199	197	}
200	198
201	199	/*
202	200	** Add a new element to the submenu
203	201

	--- src/style.c
	+++ src/style.c
	@@ -163,12 +163,11 @@
163	void style_resolve_href(void){
164	int i;
165	int nDelay = db_get_int("auto-hyperlink-delay",10);
166	if( !g.perm.Hyperlink ) return;
167	if( nHref==0 && nFormAction==0 ) return;
168	@ <script type="text/JavaScript">
169	@ /* <![CDATA[ */
170	@ function setAllHrefs(){
171	if( g.javascriptHyperlink ){
172	for(i=0; i<nHref; i++){
173	@ gebi("a%d(i+1)").href="%s(aHref[i])";
174	}
	@@ -192,11 +191,10 @@
192	@ }
193	}else{
194	/* Active hyperlinks right away */
195	@ setTimeout("setAllHrefs();",%d(nDelay));
196	}
197	@ /* ]]> */
198	@ </script>
199	}
200
201	/*
202	** Add a new element to the submenu
203

	--- src/style.c
	+++ src/style.c
	@@ -163,12 +163,11 @@
163	void style_resolve_href(void){
164	int i;
165	int nDelay = db_get_int("auto-hyperlink-delay",10);
166	if( !g.perm.Hyperlink ) return;
167	if( nHref==0 && nFormAction==0 ) return;
168	@ <script>

169	@ function setAllHrefs(){
170	if( g.javascriptHyperlink ){
171	for(i=0; i<nHref; i++){
172	@ gebi("a%d(i+1)").href="%s(aHref[i])";
173	}
	@@ -192,11 +191,10 @@
191	@ }
192	}else{
193	/* Active hyperlinks right away */
194	@ setTimeout("setAllHrefs();",%d(nDelay));
195	}

196	@ </script>
197	}
198
199	/*
200	** Add a new element to the submenu
201

M src/timeline.c

+1 -3

		--- src/timeline.c
		+++ src/timeline.c
		@@ -592,12 +592,11 @@
592	592	if( pGraph && pGraph->nErr==0 && pGraph->nRow>0 ){
593	593	GraphRow *pRow;
594	594	int i;
595	595	char cSep;
596	596
597		- @ <script type="text/JavaScript">
598		- @ /* <![CDATA[ */
	597	+ @ <script>
599	598	@ var railPitch=%d(pGraph->iRailPitch);
600	599
601	600	/* the rowinfo[] array contains all the information needed to generate
602	601	** the graph. Each entry contains information for a single row:
603	602	**
		@@ -872,11 +871,10 @@
872	871	@ lastY = h;
873	872	@ }
874	873	@ setTimeout("checkHeight();", 1000);
875	874	@ }
876	875	@ checkHeight();
877		- @ /* ]]> */
878	876	@ </script>
879	877	}
880	878	}
881	879
882	880	/*
883	881

	--- src/timeline.c
	+++ src/timeline.c
	@@ -592,12 +592,11 @@
592	if( pGraph && pGraph->nErr==0 && pGraph->nRow>0 ){
593	GraphRow *pRow;
594	int i;
595	char cSep;
596
597	@ <script type="text/JavaScript">
598	@ /* <![CDATA[ */
599	@ var railPitch=%d(pGraph->iRailPitch);
600
601	/* the rowinfo[] array contains all the information needed to generate
602	** the graph. Each entry contains information for a single row:
603	**
	@@ -872,11 +871,10 @@
872	@ lastY = h;
873	@ }
874	@ setTimeout("checkHeight();", 1000);
875	@ }
876	@ checkHeight();
877	@ /* ]]> */
878	@ </script>
879	}
880	}
881
882	/*
883

	--- src/timeline.c
	+++ src/timeline.c
	@@ -592,12 +592,11 @@
592	if( pGraph && pGraph->nErr==0 && pGraph->nRow>0 ){
593	GraphRow *pRow;
594	int i;
595	char cSep;
596
597	@ <script>

598	@ var railPitch=%d(pGraph->iRailPitch);
599
600	/* the rowinfo[] array contains all the information needed to generate
601	** the graph. Each entry contains information for a single row:
602	**
	@@ -872,11 +871,10 @@
871	@ lastY = h;
872	@ }
873	@ setTimeout("checkHeight();", 1000);
874	@ }
875	@ checkHeight();

876	@ </script>
877	}
878	}
879
880	/*
881

Fossil SCM