Skip to content
Browse files

updating to development version of modx (1.2.5-dev)

  • Loading branch information...
1 parent 0ee9a6e commit d4fab42a8dc0ec46a91f70407a5b088a7e55ba35 Igor Wiedler committed Mar 3, 2010
Showing with 70 additions and 52 deletions.
  1. +4 −4 develop/modx-schema.xsd
  2. +3 −4 install.xml
  3. +63 −44 modx.prosilver.en.xsl
View
8 develop/modx-schema.xsd
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<!-- MODX by the phpBB MOD Team XSD file v1.2.3 copyright 2005-2009 the phpBB MOD Team.
- $Id: modx-1.2.4.xsd -1 $ -->
-<xs:schema id="mod" targetNamespace="http://www.phpbb.com/mods/xml/modx-1.2.4.xsd" xmlns:xmod="http://www.phpbb.com/mods/xml/modx-1.2.4.xsd"
- xmlns="http://www.phpbb.com/mods/xml/modx-1.2.4.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ $Id: modx-1.2.4.xsd 201 2010-02-24 15:09:09Z tumba25 $ -->
+<xs:schema id="mod" targetNamespace="modx-1.2.5-dev.xsd" xmlns:xmod="modx-1.2.5-dev.xsd"
+ xmlns="modx-1.2.5-dev.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" attributeFormDefault="qualified" elementFormDefault="qualified"
xmlns:xdt="http://www.w3.org/2005/xpath-datatypes">
<xs:element name="mod" msdata:IsDataSet="true" msdata:Locale="en" msdata:EnforceConstraints="False">
@@ -235,6 +235,7 @@
<xs:attribute name="src" form="unqualified" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
+ <xs:element name="php-installer" type="xs:string" minOccurs="0" maxOccurs="1" />
<xs:element name="diy-instructions" nillable="true" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent msdata:ColumnName="diy-instructions_Text" msdata:Ordinal="1">
@@ -325,7 +326,6 @@
<xs:enumeration value="dependency" />
<xs:enumeration value="language" />
<xs:enumeration value="parent" />
- <xs:enumeration value="php-installer" />
<xs:enumeration value="template" />
<xs:enumeration value="template-lang" />
<xs:enumeration value="text" />
View
7 install.xml
@@ -47,13 +47,10 @@
<date>2010-03-xx</date>
<rev-version>1.0.0-rc3</rev-version>
<changelog lang="en">
+ <change>[Change] Updated to MODX 1.2.5</change>
</changelog>
</entry>
</history>
-
- <link-group>
- <link type="php-installer" href="install.php" lang="en" />
- </link-group>
<meta name="generator" content="MODX file generated by MODX Generator by tumba25" />
</header>
@@ -231,6 +228,8 @@ img_icon_contact_github = icon_contact_github.gif*20*28]]></action>
<action type="after-add"><![CDATA[@import url("github.css");]]></action>
</edit>
</open>
+
+ <php-installer>install.php</php-installer>
<diy-instructions lang="en">Go to the ACP -> Styles -> Imagesets; refresh each.
Go to the ACP -> Styles -> Themes; refresh each.
View
107 modx.prosilver.en.xsl
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- MODX by the phpBB MOD Team XSL file v1.2.4 copyright 2005-2010 the phpBB MOD Team.
This file is released under the GNU GPL version 2. See license.txt.
- $Id: modx.prosilver.en.xsl -1 $ -->
+ $Id: modx.prosilver.en.xsl 211 2010-02-27 20:05:11Z tumba25 $ -->
<!DOCTYPE xsl:stylesheet[
<!ENTITY nbsp "&#160;">
]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" xmlns:mod="http://www.phpbb.com/mods/xml/modx-1.2.4.xsd">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" xmlns:mod="modx-1.2.5-dev.xsd">
<xsl:output method="html" omit-xml-declaration="no" indent="yes" />
<xsl:variable name="title" select="mod:mod/mod:header/mod:title" />
<xsl:variable name="version">
@@ -415,7 +415,7 @@ ol#file-copy li { margin-left:30px; margin-right:30px; vertical-align:top;}
ol#file-copy span { font-weight:bold; }
ol#file-copy dt {margin-right:5px; float:none !important }
ol#file-copy dl {width:100%}
-h2#lang-fca, h2#lang-edts, h2#lang-diy, h2#lang-sql { margin-left:5px; }
+h2#lang-fca, h2#lang-edts, h2#lang-diy, h2#lang-sql, h2#lang-installer-h2 { margin-left:5px; }
/* Code block */
div.codebox {
@@ -1758,38 +1758,36 @@ function toggle_edit(o)
<ul class="link-group" id="link-group">
<xsl:for-each select="mod:link-group/mod:link">
- <xsl:if test="@type != 'php-installer'">
- <li lang="{@lang}">
- <span class="link-group-lang"><xsl:value-of select="@lang" />&nbsp;</span>
- <strong>
- <xsl:if test="@type = 'contrib'">
- <span id="lang-link-c[{generate-id()}]">Contrib</span>:
- </xsl:if>
- <xsl:if test="@type = 'dependency'">
- <span id="lang-link-d[{generate-id()}]">Dependency</span>:
- </xsl:if>
- <xsl:if test="@type = 'language'">
- <span id="lang-link-l[{generate-id()}]">Language</span>:
- </xsl:if>
- <xsl:if test="@type = 'parent'">
- <span id="lang-link-p[{generate-id()}]">Parent</span>:
- </xsl:if>
- <xsl:if test="@type = 'template'">
- <span id="lang-link-te[{generate-id()}]">Template</span>:
- </xsl:if>
- <xsl:if test="@type = 'template-lang'">
- <span id="lang-link-tl[{generate-id()}]">Template lang</span>:
- </xsl:if>
- <xsl:if test="@type = 'text'">
- <span id="lang-link-txt[{generate-id()}]">Text file</span>:
- </xsl:if>
- <xsl:if test="@type = 'uninstall'">
- <span id="lang-link-un[{generate-id()}]">Uninstall instructions</span>:
- </xsl:if>
- </strong>
- &nbsp;<a href="{@href}"><xsl:value-of select="current()" /></a>
- </li>
- </xsl:if>
+ <li lang="{@lang}">
+ <span class="link-group-lang"><xsl:value-of select="@lang" />&nbsp;</span>
+ <strong>
+ <xsl:if test="@type = 'contrib'">
+ <span id="lang-link-c[{generate-id()}]">Contrib</span>:
+ </xsl:if>
+ <xsl:if test="@type = 'dependency'">
+ <span id="lang-link-d[{generate-id()}]">Dependency</span>:
+ </xsl:if>
+ <xsl:if test="@type = 'language'">
+ <span id="lang-link-l[{generate-id()}]">Language</span>:
+ </xsl:if>
+ <xsl:if test="@type = 'parent'">
+ <span id="lang-link-p[{generate-id()}]">Parent</span>:
+ </xsl:if>
+ <xsl:if test="@type = 'template'">
+ <span id="lang-link-te[{generate-id()}]">Template</span>:
+ </xsl:if>
+ <xsl:if test="@type = 'template-lang'">
+ <span id="lang-link-tl[{generate-id()}]">Template lang</span>:
+ </xsl:if>
+ <xsl:if test="@type = 'text'">
+ <span id="lang-link-txt[{generate-id()}]">Text file</span>:
+ </xsl:if>
+ <xsl:if test="@type = 'uninstall'">
+ <span id="lang-link-un[{generate-id()}]">Uninstall instructions</span>:
+ </xsl:if>
+ </strong>
+ &nbsp;<a href="{@href}"><xsl:value-of select="current()" /></a>
+ </li>
</xsl:for-each>
</ul>
<hr />
@@ -2067,23 +2065,44 @@ function toggle_edit(o)
<xsl:for-each select="mod:sql">
<xsl:call-template name="give-sql"></xsl:call-template>
</xsl:for-each>
- <span class="corners-bottom"><span></span></span></div>
+ <span class="corners-bottom"><span></span></span>
+ </div>
</xsl:if>
<xsl:if test="count(mod:copy) > 0">
<xsl:for-each select="mod:copy">
<xsl:call-template name="give-filez"></xsl:call-template>
</xsl:for-each>
</xsl:if>
<xsl:if test="count(mod:open) > 0">
- <h2 id="lang-edts">Edits</h2>
- <p><span class="key">s</span><span class="key">w</span><span class="key">x</span><span id="lang-edtt">Use your keyboard to navigate the code boxes. You may also hit '<em>s</em>' on your keyboard to go to the first code box.</span></p>
- <div id="edits">
- <div class="inner">
- <xsl:for-each select="mod:open">
- <xsl:call-template name="give-fileo"></xsl:call-template>
- </xsl:for-each>
+ <h2 id="lang-edts">Edits</h2>
+ <p><span class="key">s</span><span class="key">w</span><span class="key">x</span><span id="lang-edtt">Use your keyboard to navigate the code boxes. You may also hit '<em>s</em>' on your keyboard to go to the first code box.</span></p>
+ <div id="edits">
+ <div class="inner">
+ <xsl:for-each select="mod:open">
+ <xsl:call-template name="give-fileo"></xsl:call-template>
+ </xsl:for-each>
+ </div>
+ </div>
+ </xsl:if>
+ <xsl:if test="count(mod:php-installer) > 0">
+ <h2 id="lang-installer-h2">PHP install file</h2>
+ <div class="mod-about">
+ <span class="corners-top"><span></span></span>
+ <div class="mod-about-padding">
+ <p>
+ <span id="lang-installer-exp1">This is a php install file that needs to be run in order to complete the installation.</span>
+ <br />
+ <span id="lang-installer-exp2">Point your browser to yourdomain.tld/this_file.php to run it.</span>
+ </p>
+ <div class="content">
+ <div class="codebox">
+ <div class="codeHead"><span id="lang-cde-c[{generate-id()}]">Code:</span><a href="#" onclick="select_code(this); return false;" class="codeSelect"><span id="lang-cde-sa[{generate-id()}]">Select All</span></a></div>
+ <div class="codePre"><pre id="{generate-id()}" dir="ltr"><xsl:value-of select="mod:php-installer" /></pre></div>
+ </div>
+ </div>
+ </div>
+ <span class="corners-bottom"><span></span></span>
</div>
- </div>
</xsl:if>
<xsl:call-template name="give-manual" />
</xsl:template>

0 comments on commit d4fab42

Please sign in to comment.
Something went wrong with that request. Please try again.